diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index a83d2159bb..11ab4771b9 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -648,7 +648,10 @@ var toolBar = (function () {
             // everybody else to think that Interface has lost focus overall. fogbugzid:558
             // Window.setFocus();
         }
-        entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
+        var activeLightParticle = (isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
+        entityIconOverlayManager.setVisible(activeLightParticle);
+        entityIconOverlayManager.setIconsSelectable(activeLightParticle);
+
         Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
     };
 
@@ -1464,7 +1467,10 @@ function handeMenuEvent(menuItem) {
     } else if (menuItem === "Select All Entities Touching Box") {
         selectAllEtitiesInCurrentSelectionBox(true);
     } else if (menuItem === MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE) {
-        entityIconOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
+        var activeLightParticle = (isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_AND_PARTICLES_IN_EDIT_MODE));
+        entityIconOverlayManager.setVisible(activeLightParticle);
+        entityIconOverlayManager.setIconsSelectable(activeLightParticle);
+
     } else if (menuItem === MENU_SHOW_ZONES_IN_EDIT_MODE) {
         Entities.setDrawZoneBoundaries(isActive && Menu.isOptionChecked(MENU_SHOW_ZONES_IN_EDIT_MODE));
     }
diff --git a/scripts/system/libraries/entityIconOverlayManager.js b/scripts/system/libraries/entityIconOverlayManager.js
index f557a05f60..65a98df90d 100644
--- a/scripts/system/libraries/entityIconOverlayManager.js
+++ b/scripts/system/libraries/entityIconOverlayManager.js
@@ -2,6 +2,7 @@
 
 EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
     var visible = false;
+    var iconsSelectable = false;
 
     // List of all created overlays
     var allOverlays = [];
@@ -69,6 +70,18 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
         }
     };
 
+
+    this.setIconsSelectable = function(isIconsSelectable) {
+        if (iconsSelectable !== isIconsSelectable) {
+            iconsSelectable = isIconsSelectable;
+            for (var id in entityOverlays) {
+                Overlays.editOverlay(entityOverlays[id], {
+                    ignoreRayIntersection: iconsSelectable
+                });
+            }
+        }
+    };
+
     // Allocate or get an unused overlay
     function getOverlay() {
         var overlay;
@@ -114,6 +127,10 @@ EntityIconOverlayManager = function(entityTypes, getOverlayPropertiesFunc) {
                     overlayProperties[key] = customProperties[key];
                 }
             }
+
+            if(properties.type === 'ParticleEffect' || properties.type === 'Light'){
+                overlayProperties.ignoreRayIntersection = true;
+            }
             Overlays.editOverlay(overlay, overlayProperties);
         }
     }