diff --git a/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx b/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx
index fd525d6b9b0..88f72d9052e 100644
--- a/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx
+++ b/apps/studio/localStores/storageExplorer/StorageExplorerStore.tsx
@@ -1188,15 +1188,15 @@ class StorageExplorerStore {
     const files = await this.getAllItemsAlongFolder(folder)
     await this.deleteFiles(files, isDeleteFolder)
 
-    const isFolderOpen = this.openedFolders[this.openedFolders.length - 1]?.name === folder.name
-    if (isFolderOpen) {
-      this.popColumnAtIndex(folder.columnIndex)
-      this.popOpenedFoldersAtIndex(folder.columnIndex - 1)
-    }
+    this.popColumnAtIndex(folder.columnIndex)
+    this.popOpenedFoldersAtIndex(folder.columnIndex - 1)
 
-    const parentFolderPrefix = this.openedFolders.map((folder) => folder.name).join('/')
-    if (parentFolderPrefix.length > 0) {
-      await this.validateParentFolderEmpty(parentFolderPrefix)
+    if (folder.columnIndex > 0) {
+      const parentFolderPrefix = this.openedFolders
+        .slice(0, folder.columnIndex)
+        .map((folder) => folder.name)
+        .join('/')
+      if (parentFolderPrefix.length > 0) await this.validateParentFolderEmpty(parentFolderPrefix)
     }
 
     await this.refetchAllOpenedFolders()