diff --git a/source/godmode.c b/source/godmode.c
index 9595296..234e626 100644
--- a/source/godmode.c
+++ b/source/godmode.c
@@ -1021,6 +1021,12 @@ u32 FileHandlerMenu(char* current_path, u32* cursor, u32* scroll, PaneData** pan
     else if (user_select == searchdrv) { // -> search drive, open containing path
         char* last_slash = strrchr(curr_entry->path, '/');
         if (last_slash) {
+            if (N_PANES) { // switch to next pane
+                memcpy((*pane)->path, current_path, 256);  // store current pane state
+                (*pane)->cursor = *cursor;
+                (*pane)->scroll = *scroll;
+                if (++*pane >= panedata + N_PANES) *pane -= N_PANES;
+            }
             snprintf(current_path, last_slash - curr_entry->path + 1, "%s", curr_entry->path);
             GetDirContents(current_dir, current_path);
             *cursor = 1;