diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
index e8ed0105432..c746560dae9 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/StorageExplorer.js
@@ -78,14 +78,24 @@ const StorageExplorer = observer(({ bucket }) => {
     const currentFolder = openedFolders[currentFolderIdx]
 
     if (itemSearchString) {
-      await fetchFolderContents(
-        currentFolder.id,
-        currentFolder.name,
-        currentFolderIdx,
-        itemSearchString
-      )
-    } else if (currentFolder) {
-      await fetchFolderContents(currentFolder.id, currentFolder.name, currentFolderIdx)
+      if (!currentFolder) {
+        // At root of bucket
+        await fetchFolderContents(bucket.id, bucket.name, -1, itemSearchString)
+      } else {
+        await fetchFolderContents(
+          currentFolder.id,
+          currentFolder.name,
+          currentFolderIdx,
+          itemSearchString
+        )
+      }
+    } else {
+      if (!currentFolder) {
+        // At root of bucket
+        await fetchFolderContents(bucket.id, bucket.name, -1)
+      } else {
+        await fetchFolderContents(currentFolder.id, currentFolder.name, currentFolderIdx)
+      }
     }
   }, [itemSearchString])