diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index f9081080fd..91ddf2a2d1 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -4064,7 +4064,6 @@ 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);
@@ -4075,6 +4074,8 @@ SelectionDisplay = (function() {
             return false;
         }
 
+        entityIconOverlayManager.setIconsSelectable(selectionManager.selections,true);
+
         // before we do a ray test for grabbers, disable the ray intersection for our selection box
         Overlays.editOverlay(selectionBox, {
             ignoreRayIntersection: true