diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 47b77cf435b..fb91a65a7cc 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -3546,10 +3546,12 @@ void WM_event_add_fileselect(bContext *C, wmOperator *op)
   wmWindowManager *wm = CTX_wm_manager(C);
   wmWindow *win = CTX_wm_window(C);
   const bool is_temp_screen = WM_window_is_temp_screen(win);
-  /* Don't add the file handler to the temporary window, or else it owns the handlers for itself,
-   * causing dangling pointers once it's destructed through a handler. It has a parent which should
-   * hold the handlers itself. */
-  ListBase *modalhandlers = is_temp_screen ? &win->parent->modalhandlers : &win->modalhandlers;
+  const bool opens_window = (U.filebrowser_display_type == USER_TEMP_SPACE_DISPLAY_WINDOW);
+  /* Don't add the file handler to the temporary window if one is opened, or else it owns the
+   * handlers for itself, causing dangling pointers once it's destructed through a handler. It has
+   * a parent which should hold the handlers itself. */
+  ListBase *modalhandlers = (is_temp_screen && opens_window) ? &win->parent->modalhandlers :
+                                                               &win->modalhandlers;
 
   /* Close any popups, like when opening a file browser from the splash. */
   UI_popup_handlers_remove_all(C, modalhandlers);