diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 57331ff62a..75868466ad 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -22754,6 +22754,17 @@ Change of this parameter will affect the layout of buttons in notification toast
       <key>Value</key>
       <integer>1023</integer>
     </map>
-</map>
+    <key>FSMenuSearch</key>
+    <map>
+      <key>Comment</key>
+      <string>If enabled, the viewer will show a search box for top menu itens (needs a restart).</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+  </map>
 </llsd>
 
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 74f6abe662..4b626850f4 100755
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -441,9 +441,14 @@ BOOL LLStatusBar::postBuild()
 
 	// <FS:ND> Hook up and init for filtering
 	mFilterEdit = getChild<LLSearchEditor>("search_menu_edit");
-	mFilterEdit->setKeystrokeCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this));
-	mFilterEdit->setCommitCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this));
-	collectSearchableItems();
+	if( gSavedSettings.getBOOL( "FSMenuSearch" ) )
+	{
+		mFilterEdit->setKeystrokeCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this));
+		mFilterEdit->setCommitCallback(boost::bind(&LLStatusBar::onUpdateFilterTerm, this));
+		collectSearchableItems();
+	}
+	else
+		mFilterEdit->setVisible( FALSE );
 	// </FS:ND>
 
 	return TRUE;
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
index 9a71a496af..ef0e0a8c2a 100755
--- a/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_advanced.xml
@@ -7,6 +7,7 @@
 	<check_box label="Bei Anmeldung Gridauswahl anzeigen" name="show_grid_selection_check"/>
 	<check_box label="Menü „Erweitert“ anzeigen" name="show_advanced_menu_check"/>
 	<check_box label="Menü „Entwickler“ anzeigen" name="show_develop_menu_check"/>
+	<check_box label="Menüsuche anzeigen (Neustart erforderlich)" name="show_search_menu_check"/>
 	<check_box label="Aktiviere Zeitschritte für Animationen (experimentell)" name="UseAnimationTimeSteps" tool_tip="Diese Einstellung kann die Render-Komplexität für entfernte Avatare verringen, aber dadurch können deren Animationen in falscher Geschwindigkeit abgespielt werden."/>
 	<text name="BackgroundYieldTimeText">
 		Zeit in Millisekunden, die pro Frame an andere Anwendungen abgegeben werden, wenn [APP_NAME] nicht im Vordergrund ist [Standard: 40; 1 Sekunde = 1000 Millisekunden]
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 41463a37e5..4cbbde2889 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -58,6 +58,17 @@
      top_pad="5"
      width="237"/>
 
+    <check_box
+     control_name="FSMenuSearch"
+     follows="top|left"
+     height="15"
+     label="Show Menu Search (needs restart)."
+     layout="topleft"
+     left="30"
+     name="show_search_menu_check"
+     top_pad="5"
+     width="237"/>
+
     <check_box
      control_name="UseAnimationTimeSteps"
      tool_tip="This setting may reduce render load for distant avatars but, may also cause their animations to play at incorrect speeds"