diff --git a/indra/llui/llfolderview.cpp b/indra/llui/llfolderview.cpp
index d66d19dcca..c9f8cf28c1 100755
--- a/indra/llui/llfolderview.cpp
+++ b/indra/llui/llfolderview.cpp
@@ -640,7 +640,11 @@ void LLFolderView::draw()
 		closeAutoOpenedFolders();
 	}
 
-	if (mSearchTimer.getElapsedTimeF32() > LLUI::sSettingGroups["config"]->getF32("TypeAheadTimeout") || !mSearchString.size())
+	// <FS:Ansariel> Performance improvement
+	//if (mSearchTimer.getElapsedTimeF32() > LLUI::sSettingGroups["config"]->getF32("TypeAheadTimeout") || !mSearchString.size())
+	static LLCachedControl<F32> typeAheadTimeout(*LLUI::sSettingGroups["config"], "TypeAheadTimeout");
+	if (mSearchTimer.getElapsedTimeF32() > typeAheadTimeout || !mSearchString.size())
+	// </FS:Ansariel>
 	{
 		mSearchString.clear();
 	}