diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 390bd5beb3..06260277fd 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -664,6 +664,7 @@ var toolBar = (function () {
             selectionDisplay.triggerMapping.enable();
             print("starting tablet in landscape mode");
             tablet.landscape = true;
+            entityIconOverlayManager.setIconsSelectable(null,false);
             // Not sure what the following was meant to accomplish, but it currently causes
             // everybody else to think that Interface has lost focus overall. fogbugzid:558
             // Window.setFocus();
@@ -991,6 +992,7 @@ function mouseClickEvent(event) {
                 } else {
                     selectionManager.addEntity(foundEntity, true);
                 }
+
                 if (wantDebug) {
                     print("Model selected: " + foundEntity);
                 }
diff --git a/scripts/system/libraries/entityIconOverlayManager.js b/scripts/system/libraries/entityIconOverlayManager.js
index f557a05f60..a374783b1f 100644
--- a/scripts/system/libraries/entityIconOverlayManager.js
+++ b/scripts/system/libraries/entityIconOverlayManager.js
@@ -1,6 +1,7 @@
 /* globals EntityIconOverlayManager:true */
 
 EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
+
     var visible = false;
 
     // List of all created overlays
@@ -69,6 +70,29 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
         }
     };
 
+
+    this.setIconsSelectable = function(arrayOfSelectedEntityIDs, isIconsSelectable) {
+        if (arrayOfSelectedEntityIDs === null) {
+            for (var id in entityOverlays) {
+                Overlays.editOverlay(entityOverlays[id], {
+                    ignoreRayIntersection: isIconsSelectable
+                });
+            }
+        } else {
+            for (var id in entityOverlays) {
+                if (arrayOfSelectedEntityIDs.indexOf(id) !== -1) { // in the entityOverlays array and selectable
+                    Overlays.editOverlay(entityOverlays[id], {
+                        ignoreRayIntersection: isIconsSelectable
+                    });
+                } else {
+                    Overlays.editOverlay(entityOverlays[id], {
+                        ignoreRayIntersection: !isIconsSelectable
+                    });
+                }
+            }
+        }
+    };
+
     // Allocate or get an unused overlay
     function getOverlay() {
         var overlay;
@@ -114,6 +138,9 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
                     overlayProperties[key] = customProperties[key];
                 }
             }
+            if(properties.type === 'ParticleEffect' || properties.type === 'Light'){
+                overlayProperties.ignoreRayIntersection = true;
+            }
             Overlays.editOverlay(overlay, overlayProperties);
         }
     }
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 2d1853fae2..77b62913bf 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -4060,6 +4060,8 @@ SelectionDisplay = (function() {
             return false;
         }
 
+        entityIconOverlayManager.setIconsSelectable(selectionManager.selections,true);
+
         // ignore ray intersection for our selection box and yaw/pitch/roll
         result = Overlays.findRayIntersection(pickRay, true, null, [ yawHandle, pitchHandle, rollHandle, selectionBox ] );
         if (result.intersects) {