diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
index 20cbc90217..16e37df528 100755
--- a/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences.xml
@@ -6,7 +6,9 @@
 	<button label="Anwenden" label_selected="Anwenden" name="Apply"/>
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
-	<search_editor label="Einstellungen suchen" name="search_prefs_edit" tool_tip="Den Suchbegriff hier eingeben. Ergebnisse werden für Treffer im Namen oder Kommentar einer Einstellung angezeigt."/>
+	<panel name="search_panel">
+		<search_editor label="Einstellungen suchen" name="search_prefs_edit" tool_tip="Den Suchbegriff hier eingeben. Ergebnisse werden für Treffer im Namen oder Kommentar einer Einstellung angezeigt."/>
+	</panel>
 	<tab_container name="pref core">
 		<panel label="Allgemein" name="general"/>
 		<panel label="Chat" name="chat"/>
diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml
index 2516592773..05e7d5acac 100755
--- a/indra/newview/skins/default/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en/floater_preferences.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  positioning="centered"
- default_tab_group="1"
+ default_tab_group="2"
  height="521"
  layout="topleft"
  name="Preferences"
@@ -55,31 +55,41 @@
         <button.commit_callback
          function="Pref.Cancel" />
     </button>
-	
-	<search_editor
-		clear_button_visible="true"
-		follows="left|top"
-		height="18"
-		label="Search Settings"
-		layout="topleft"
-		left="0"
-		max_length_bytes="255"
-		name="search_prefs_edit"
-		right="-1"
-		text_pad_left="6"
-		tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."
-		top="21">
-	  <search_editor.commit_callback
-		  function="UpdateFilter" />
-	  <search_editor.clear_button
-		  rect.height="18"
-		  rect.width="18"
-		  rect.bottom="-1" />
-	  <search_editor.search_button
-		  rect.height="12"
-		  rect.width="12"
-		  rect.bottom="-1" />
-	</search_editor>
+
+    <panel
+     name="search_panel"
+     layout="topleft"
+     follows="left|top|right"
+     left="4"
+     right="-4"
+     top="21"
+     height="18"
+     tab_group="2">
+        <search_editor
+         clear_button_visible="true"
+         follows="left|top|right"
+         height="18"
+         label="Search Settings"
+         layout="topleft"
+         left="0"
+         max_length_bytes="255"
+         name="search_prefs_edit"
+         right="-1"
+         text_pad_left="6"
+         tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."
+         top="0">
+         <search_editor.commit_callback
+          function="UpdateFilter" />
+         <search_editor.clear_button
+          rect.height="18"
+          rect.width="18"
+          rect.bottom="-1" />
+         <search_editor.search_button
+          rect.height="12"
+          rect.width="12"
+          rect.bottom="-1" />
+        </search_editor>
+    </panel>
 
     <tab_container
      follows="all"
diff --git a/indra/newview/skins/default/xui/pl/floater_preferences.xml b/indra/newview/skins/default/xui/pl/floater_preferences.xml
index 24d4c3e4f2..3530961e41 100755
--- a/indra/newview/skins/default/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/pl/floater_preferences.xml
@@ -5,7 +5,9 @@
 	</floater.string>
 	<button label="Zastosuj" label_selected="Zastosuj" name="Apply"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
-	<search_editor label="Szukaj w ustawieniach" name="search_prefs_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw lub komentarzy przypisanych do ustawień." />
+	<panel name="search_panel">
+		<search_editor label="Szukaj w ustawieniach" name="search_prefs_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw lub komentarzy przypisanych do ustawień." />
+	</panel>
 	<tab_container name="pref core">
 		<panel label="Ogólne" name="general"/>
 		<panel label="Czat" name="chat"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_preferences.xml b/indra/newview/skins/default/xui/ru/floater_preferences.xml
index 93949e8366..101ce6cfa8 100755
--- a/indra/newview/skins/default/xui/ru/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/ru/floater_preferences.xml
@@ -5,7 +5,9 @@
 	</floater.string>
 	<button label="Применить" label_selected="Применить" name="Apply"/>
 	<button label="Отменить" label_selected="Отменить" name="Cancel"/>
-	<search_editor label="Поиск в настройках" name="search_prefs_edit" tool_tip="Введите в этом месте интересную вас фразу. Результаты будут выделены для подходящих фрагментов названий или комментариев, приписанных в настройках" />
+	<panel name="search_panel">
+		<search_editor label="Поиск в настройках" name="search_prefs_edit" tool_tip="Введите в этом месте интересную вас фразу. Результаты будут выделены для подходящих фрагментов названий или комментариев, приписанных в настройках" />
+	</panel>
 	<tab_container name="pref core">
 		<panel label="Общие" name="general"/>
 		<panel label="Чат" name="chat"/>
diff --git a/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
index 66162606c4..cebe05b3f3 100644
--- a/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
@@ -6,7 +6,9 @@
 	<button label="Anwenden" label_selected="Anwenden" name="Apply"/>
 	<button label="OK" label_selected="OK" name="OK"/>
 	<button label="Abbrechen" label_selected="Abbrechen" name="Cancel"/>
-	<search_editor label="Einstellungen suchen" name="search_prefs_edit" tool_tip="Den Suchbegriff hier eingeben. Ergebnisse werden für Treffer im Namen oder Kommentar einer Einstellung angezeigt."/>
+	<panel name="search_panel">
+		<search_editor label="Einstellungen suchen" name="search_prefs_edit" tool_tip="Den Suchbegriff hier eingeben. Ergebnisse werden für Treffer im Namen oder Kommentar einer Einstellung angezeigt."/>
+	</panel>
 	<tab_container name="pref core">
 		<panel label="Allgemein" name="general"/>
 		<panel label="Chat" name="chat"/>
diff --git a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
index 9e7a6d9913..2b8d88479c 100644
--- a/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/en/floater_preferences.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  positioning="centered"
- default_tab_group="1"
+ default_tab_group="2"
  height="521"
  layout="topleft"
  name="Preferences"
@@ -55,31 +55,41 @@
         <button.commit_callback
          function="Pref.Cancel" />
     </button>
-	
-	<search_editor
-		clear_button_visible="true"
-		follows="left|top"
-		height="18"
-		label="Search Settings"
-		layout="topleft"
-		left="0"
-		max_length_bytes="255"
-		name="search_prefs_edit"
-		right="-1"
-		text_pad_left="6"
-		tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."
-		top="21">
-	  <search_editor.commit_callback
-		  function="UpdateFilter" />
-	  <search_editor.clear_button
-		  rect.height="18"
-		  rect.width="18"
-		  rect.bottom="-1" />
-	  <search_editor.search_button
-		  rect.height="12"
-		  rect.width="12"
-		  rect.bottom="-1" />
-	</search_editor>
+
+    <panel
+     name="search_panel"
+     layout="topleft"
+     follows="left|top|right"
+     left="4"
+     right="-4"
+     top="21"
+     height="18"
+     tab_group="2">
+        <search_editor
+         clear_button_visible="true"
+         follows="left|top|right"
+         height="18"
+         label="Search Settings"
+         layout="topleft"
+         left="0"
+         max_length_bytes="255"
+         name="search_prefs_edit"
+         right="-1"
+         text_pad_left="6"
+         tool_tip="Type the search term you are interested in here. Results will be displayed for partial fulltext matches within the setting's name or comment."
+         top="0">
+         <search_editor.commit_callback
+          function="UpdateFilter" />
+         <search_editor.clear_button
+          rect.height="18"
+          rect.width="18"
+          rect.bottom="-1" />
+         <search_editor.search_button
+          rect.height="12"
+          rect.width="12"
+          rect.bottom="-1" />
+        </search_editor>
+    </panel>
 
     <tab_container
      follows="all"
diff --git a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
index 23d4af58c3..156f7e5fd6 100644
--- a/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/floater_preferences.xml
@@ -5,7 +5,9 @@
 	</floater.string>
 	<button label="Zastosuj" label_selected="Zastosuj" name="Apply"/>
 	<button label="Anuluj" label_selected="Anuluj" name="Cancel"/>
-	<search_editor label="Szukaj w ustawieniach" name="search_prefs_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw lub komentarzy przypisanych do ustawień." />
+	<panel name="search_panel">
+		<search_editor label="Szukaj w ustawieniach" name="search_prefs_edit" tool_tip="Wprowadź w tym miejscu interesującą Cię frazę. Wyniki będą wyświetlane dla pasujących fragmentów nazw lub komentarzy przypisanych do ustawień." />
+	</panel>
 	<tab_container name="pref core">
 		<panel label="Ogólne" name="general"/>
 		<panel label="Czat" name="chat"/>