diff --git a/src/modals/SelectMapModal.js b/src/modals/SelectMapModal.js
index 2236bc5..f747dce 100644
--- a/src/modals/SelectMapModal.js
+++ b/src/modals/SelectMapModal.js
@@ -332,6 +332,10 @@ function SelectMapModal({
         selectedMapIds.length > 0 &&
         !selectedMaps.some((map) => map.type === "default")
       ) {
+        // Ensure all other modals are closed
+        setIsGroupModalOpen(false);
+        setIsEditModalOpen(false);
+        setIsMapsResetModalOpen(false);
         setIsMapsRemoveModalOpen(true);
       }
     }
diff --git a/src/modals/SelectTokensModal.js b/src/modals/SelectTokensModal.js
index 7d92d55..083bbd6 100644
--- a/src/modals/SelectTokensModal.js
+++ b/src/modals/SelectTokensModal.js
@@ -191,6 +191,9 @@ function SelectTokensModal({ isOpen, onRequestClose }) {
         selectedTokenIds.length > 0 &&
         !selectedTokens.some((token) => token.type === "default")
       ) {
+        // Ensure all other modals are closed
+        setIsEditModalOpen(false);
+        setIsGroupModalOpen(false);
         setIsTokensRemoveModalOpen(true);
       }
     }