diff --git a/src/components/map/MapTiles.js b/src/components/map/MapTiles.js
index 5b014ac..b996ea5 100644
--- a/src/components/map/MapTiles.js
+++ b/src/components/map/MapTiles.js
@@ -46,13 +46,9 @@ function MapTiles({
     }
   }
 
-  let hasSelectedDefaultMap = false;
-  for (let map of selectedMaps) {
-    if (map.type === "default") {
-      hasSelectedDefaultMap = true;
-      break;
-    }
-  }
+  let hasSelectedDefaultMap = selectedMaps.some(
+    (map) => map.type === "default"
+  );
 
   function mapToTile(map) {
     const isSelected = selectedMaps.includes(map);
diff --git a/src/components/token/TokenTiles.js b/src/components/token/TokenTiles.js
index 3a8e462..c721fef 100644
--- a/src/components/token/TokenTiles.js
+++ b/src/components/token/TokenTiles.js
@@ -33,16 +33,10 @@ function TokenTiles({
   const { databaseStatus } = useContext(DatabaseContext);
   const isSmallScreen = useMedia({ query: "(max-width: 500px)" });
 
-  let hasSelectedDefaultToken = false;
-  let allTokensVisible = true;
-  for (let token of selectedTokens) {
-    if (token.type === "default") {
-      hasSelectedDefaultToken = true;
-    }
-    if (token.hideInSidebar) {
-      allTokensVisible = false;
-    }
-  }
+  let hasSelectedDefaultToken = selectedTokens.some(
+    (token) => token.type === "default"
+  );
+  let allTokensVisible = selectedTokens.every((token) => !token.hideInSidebar);
 
   function tokenToTile(token) {
     const isSelected = selectedTokens.includes(token);
diff --git a/src/modals/SelectMapModal.js b/src/modals/SelectMapModal.js
index c1329fa..aed9797 100644
--- a/src/modals/SelectMapModal.js
+++ b/src/modals/SelectMapModal.js
@@ -298,6 +298,15 @@ function SelectMapModal({
     if (key === "Control" || key === "Meta") {
       setSelectMode("multiple");
     }
+    if (key === "Backspace" || key === "Delete") {
+      // Selected maps and none are default
+      if (
+        selectedMapIds.length > 0 &&
+        !selectedMaps.some((map) => map.type === "default")
+      ) {
+        setIsMapsRemoveModalOpen(true);
+      }
+    }
   }
 
   function handleKeyUp({ key }) {
diff --git a/src/modals/SelectTokensModal.js b/src/modals/SelectTokensModal.js
index 08ee667..a15c1be 100644
--- a/src/modals/SelectTokensModal.js
+++ b/src/modals/SelectTokensModal.js
@@ -170,6 +170,15 @@ function SelectTokensModal({ isOpen, onRequestClose }) {
     if (key === "Control" || key === "Meta") {
       setSelectMode("multiple");
     }
+    if (key === "Backspace" || key === "Delete") {
+      // Selected tokens and none are default
+      if (
+        selectedTokenIds.length > 0 &&
+        !selectedTokens.some((token) => token.type === "default")
+      ) {
+        setIsTokensRemoveModalOpen(true);
+      }
+    }
   }
 
   function handleKeyUp({ key }) {