Fix menu search expanding file browser menus

2 files changed, 15 insertions, 3 deletions

diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py
index 53fc812a619..9a39d840149 100644
--- a/release/scripts/startup/bl_ui/space_filebrowser.py
+++ b/release/scripts/startup/bl_ui/space_filebrowser.py
@@ -20,6 +20,7 @@
 from bpy.types import Header, Panel, Menu, UIList
 
 
+
 class FILEBROWSER_HT_header(Header):
     bl_space_type = 'FILE_BROWSER'
 
@@ -31,8 +32,7 @@ class FILEBROWSER_HT_header(Header):
         if st.active_operator is None:
             layout.template_header()
 
-        layout.menu("FILEBROWSER_MT_view")
-        layout.menu("FILEBROWSER_MT_select")
+        FILEBROWSER_MT_editor_menus.draw_collapsible(context, layout)
 
         # can be None when save/reload with a file selector open
 
@@ -411,6 +411,17 @@ class FILEBROWSER_PT_directory_path(Panel):
             ).region_type = 'TOOL_PROPS'
 
 
+class FILEBROWSER_MT_editor_menus(Menu):
+    bl_idname = "FILEBROWSER_MT_editor_menus"
+    bl_label = ""
+
+    def draw(self, _context):
+        layout = self.layout
+
+        layout.menu("FILEBROWSER_MT_view")
+        layout.menu("FILEBROWSER_MT_select")
+
+
 class FILEBROWSER_MT_view(Menu):
     bl_label = "View"
 
@@ -502,6 +513,7 @@ classes = (
     FILEBROWSER_PT_bookmarks_recents,
     FILEBROWSER_PT_advanced_filter,
     FILEBROWSER_PT_directory_path,
+    FILEBROWSER_MT_editor_menus,
     FILEBROWSER_MT_view,
     FILEBROWSER_MT_select,
     FILEBROWSER_MT_context_menu,
diff --git a/source/blender/editors/interface/interface_template_search_menu.c b/source/blender/editors/interface/interface_template_search_menu.c
index 122a40a936f..451f426cd71 100644
--- a/source/blender/editors/interface/interface_template_search_menu.c
+++ b/source/blender/editors/interface/interface_template_search_menu.c
@@ -497,7 +497,7 @@ static struct MenuSearch_Data *menu_items_from_ui_create(
           SPACE_MENU_MAP(SPACE_GRAPH, "GRAPH_MT_editor_menus");
           SPACE_MENU_MAP(SPACE_OUTLINER, "OUTLINER_MT_editor_menus");
           SPACE_MENU_NOP(SPACE_PROPERTIES);
-          SPACE_MENU_MAP(SPACE_FILE, "FILE_MT_editor_menus");
+          SPACE_MENU_MAP(SPACE_FILE, "FILEBROWSER_MT_editor_menus");
           SPACE_MENU_MAP(SPACE_IMAGE, "IMAGE_MT_editor_menus");
           SPACE_MENU_MAP(SPACE_INFO, "INFO_MT_editor_menus");
           SPACE_MENU_MAP(SPACE_SEQ, "SEQUENCER_MT_editor_menus");