diff --git a/apps/studio/state/storage-explorer.tsx b/apps/studio/state/storage-explorer.tsx
index 9ff8e4cd20c..f038ccaa5a1 100644
--- a/apps/studio/state/storage-explorer.tsx
+++ b/apps/studio/state/storage-explorer.tsx
@@ -419,8 +419,17 @@ export function createStorageExplorerState({
     },
 
     refetchAllOpenedFolders: async () => {
-      const paths = state.openedFolders.map((folder) => folder.name)
-      await state.fetchFoldersByPath({ paths, searchString: state.itemSearchString })
+      if (state.itemSearchString) {
+        const paths = state.openedFolders.map((folder) => folder.name)
+        await state.fetchFoldersByPath({ paths: paths.slice(0, -1) })
+        await state.fetchFoldersByPath({
+          paths: [paths[paths.length - 1]],
+          searchString: state.itemSearchString,
+        })
+      } else {
+        const paths = state.openedFolders.map((folder) => folder.name)
+        await state.fetchFoldersByPath({ paths })
+      }
     },
 
     refreshAll: async () => {