diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index e9afc3a167..52b8c8d51e 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -943,8 +943,6 @@ function mouseClickEvent(event) {
                     selectionManager.addEntity(foundEntity, true);
                 }
 
-                entityIconOverlayManager.setIconsSelectable(selectionManager.selections,true);
-
                 if (wantDebug) {
                     print("Model selected: " + foundEntity);
                 }
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 725803f824..f9081080fd 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -4064,6 +4064,7 @@ SelectionDisplay = (function() {
             // if another mouse button than left is pressed ignore it
             return false;
         }
+        entityIconOverlayManager.setIconsSelectable(selectionManager.selections,true);
 
         var somethingClicked = false;
         var pickRay = generalComputePickRay(event.x, event.y);