diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
index c17083e44f..053ddf2070 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
@@ -6,7 +6,7 @@
 	<menu_item_check label="Ordner immer nach Namen sortieren" name="sort_folders_by_name"/>
 	<menu_item_check label="Systemordner nach oben" name="sort_system_folders_to_top"/>
 	<!-- ## Zi: Extended Inventory Search -->
-	<menu label="Suchen nach..." name="inventory_search_menu">
+	<context_menu label="Suchen nach..." name="inventory_search_menu">
 		<menu_item_check name="inventory_search_by_name" label="Name"/>
 		<menu_item_check name="inventory_search_by_creator" label="Ersteller"/>
 		<menu_item_check name="inventory_search_by_description" label="Beschreibung"/>
@@ -15,7 +15,7 @@
 <!-- Not implemented yet
 		<menu_item_check name="inventory_show_partial_results" label="Zeige unvollständige Suchergebnisse"/>
 -->
-	</menu>
+	</context_menu>
 	<!-- ## Zi: Extended Inventory Search -->
     <menu_item_check label="Objekte hinzufügen per Doppelklick" name="add_inv_toggle"/>
 	<menu_item_call label="Filter anzeigen" name="show_filters"/>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index 70c11d5ed1..4ffb55a968 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -64,7 +64,7 @@
      layout="topleft" />
 
     <!-- ## Zi: Extended Inventory Search -->
-	<menu
+	<context_menu
 		label="Search By..."
 		name="inventory_search_menu"
 		top="0">
@@ -132,7 +132,7 @@
 				parameter="partial" />
 		</menu_item_check>
 -->
-	</menu>
+	</context_menu>
     <!-- ## Zi: Extended Inventory Search -->
 
     <menu_item_separator
diff --git a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
index 1e304cb7e8..59c14a693a 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory_gear_default.xml
@@ -5,14 +5,14 @@
 	<menu_item_check label="Ordenar por los más recientes" name="sort_by_recent"/>
 	<menu_item_check label="Ordenar las carpetas siempre alfabéticamente" name="sort_folders_by_name"/>
 	<menu_item_check label="Las carpetas del sistema, arriba" name="sort_system_folders_to_top"/>
-	<menu label="Buscar por..." name="inventory_search_menu">
+	<context_menu label="Buscar por..." name="inventory_search_menu">
 		<menu_item_check name="inventory_search_by_name" label="Nombre"/>
 		<menu_item_check name="inventory_search_by_creator" label="Creador"/>
 		<menu_item_check name="inventory_search_by_description" label="Descripción"/>
 		<menu_item_check name="inventory_search_by_uuid" label="UUID"/>
 		<menu_item_check name="inventory_search_by_all" label="Todo"/>
 		<menu_item_check name="inventory_show_partial_results" label="Mostrar resultados parciales de búsqueda"/>
-	</menu>
+	</context_menu>
 	<menu_item_call label="Añadir objetos con doble clic" name="add_inv_toggle"/>
 	<menu_item_call label="Ver los filtros" name="show_filters"/>
 	<menu_item_call label="Restablecer los filtros" name="reset_filters"/>
diff --git a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
index 0f377a86ce..5c9090d9ec 100644
--- a/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/it/menu_inventory_gear_default.xml
@@ -6,13 +6,13 @@
 	<menu_item_check label="Ordina le cartelle sempre in base al nome" name="sort_folders_by_name"/>
 	<menu_item_check label="Ordina cartelle di sistema all&apos;inizio" name="sort_system_folders_to_top"/>
 	<!-- ## Zi: Extended Inventory Search -->
-	<menu label="Cerca per..." name="inventory_search_menu">
+	<context_menu label="Cerca per..." name="inventory_search_menu">
 		<menu_item_check name="inventory_search_by_name" label="Nome"/>
 		<menu_item_check name="inventory_search_by_creator" label="Creatore"/>
 		<menu_item_check name="inventory_search_by_description" label="Descrizione"/>
 		<menu_item_check name="inventory_search_by_uuid" label="UUID"/>
 		<menu_item_check name="inventory_search_by_all" label="Tutti"/>
-	</menu>
+	</context_menu>
 	<menu_item_check label="Aggiungi oggetto con doppio click" name="add_inv_toggle"/>
 	<menu_item_call label="Mostra filtri" name="show_filters"/>
 	<menu_item_call label="Ripristina filtri" name="reset_filters"/>
diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
index 58111d6a8b..da81757db2 100644
--- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml
@@ -5,13 +5,13 @@
 	<menu_item_check label="Porządkuj według daty" name="sort_by_recent"/>
 	<menu_item_check label="Sortuj foldery zawsze wg. nazwy" name="sort_folders_by_name"/>
 	<menu_item_check label="Sortuj foldery systemowe od góry" name="sort_system_folders_to_top"/>
-	<menu label="Szukaj po..." name="inventory_search_menu">
+	<context_menu label="Szukaj po..." name="inventory_search_menu">
 		<menu_item_check name="inventory_search_by_name" label="Nazwie"/>
 		<menu_item_check name="inventory_search_by_creator" label="Twórcy"/>
 		<menu_item_check name="inventory_search_by_description" label="Opisie"/>
 		<menu_item_check name="inventory_search_by_all" label="Wszystkim"/>
 		<menu_item_check name="inventory_show_partial_results" label="Częściowe wyniki wyszukiwania"/>
-	</menu>
+	</context_menu>
 	<menu_item_check label="Dodawaj obiekty po dwukliku" name="add_inv_toggle"/>
 	<menu_item_call label="Pokaż filtry" name="show_filters"/>
 	<menu_item_call label="Zresetuj filtry" name="reset_filters"/>