diff --git a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
index ebf400f1ea1..efc6aa48d98 100644
--- a/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
+++ b/studio/components/to-be-cleaned/Storage/StorageExplorer/FileExplorerRow.js
@@ -307,6 +307,10 @@ const FileExplorerRow = ({
           className={`flex items-center justify-end ${
             view === STORAGE_VIEWS.LIST ? 'flex-grow' : 'w-[10%]'
           }`}
+          onClick={(event) =>
+            // Stops click event from this div, to resolve an issue with menu item's click event triggering unexpected row select
+            event.stopPropagation()
+          }
         >
           {item.status === STORAGE_ROW_STATUS.LOADING ? (
             <IconLoader
diff --git a/studio/localStores/storageExplorer/StorageExplorerStore.js b/studio/localStores/storageExplorer/StorageExplorerStore.js
index d553efa0f76..9980b30e17b 100644
--- a/studio/localStores/storageExplorer/StorageExplorerStore.js
+++ b/studio/localStores/storageExplorer/StorageExplorerStore.js
@@ -1183,7 +1183,7 @@ class StorageExplorerStore {
     const files = await this.getAllItemsAlongFolder(folder)
     await this.deleteFiles(files, isDeleteFolder)
 
-    const isFolderOpen = this.openedFolders[this.openedFolders.length - 1].name === folder.name
+    const isFolderOpen = this.openedFolders[this.openedFolders.length - 1]?.name === folder.name
     if (isFolderOpen) {
       this.popColumnAtIndex(folder.columnIndex)
       this.popOpenedFoldersAtIndex(folder.columnIndex - 1)