diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js
index 4d152688b8..7cdcd7a6fc 100644
--- a/scripts/system/create/entityList/html/js/entityList.js
+++ b/scripts/system/create/entityList/html/js/entityList.js
@@ -1542,7 +1542,7 @@ function loaded() {
                     break;
             }
 
-            if (controlKey && keyCodeString === "A") {
+            if (controlKey && !shiftKey && !altKey && keyCodeString === "A") {
                 let visibleEntityIDs = visibleEntities.map(visibleEntity => visibleEntity.id);
                 let selectionIncludesAllVisibleEntityIDs = visibleEntityIDs.every(visibleEntityID => {
                     return selectedEntities.includes(visibleEntityID);
@@ -1565,7 +1565,7 @@ function loaded() {
                 return;
             }
 
-            if (controlKey && keyCodeString === "I") {
+            if (controlKey && !shiftKey && !altKey && keyCodeString === "I") {
                 let visibleEntityIDs = visibleEntities.map(visibleEntity => visibleEntity.id);
                 let selectionIncludesAllVisibleEntityIDs = visibleEntityIDs.every(visibleEntityID => {
                     return selectedEntities.includes(visibleEntityID);