diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index d77b5804c8..2f7e0fabd7 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -594,18 +594,12 @@ function findClickedEntity(event) {
 
     var result;
 
-    if (!entityResult.intersects && !lightResult.intersects) {
-        return null;
-    } else if (entityResult.intersects && !lightResult.intersects) {
-        result = entityResult;
-    } else if (!entityResult.intersects && lightResult.intersects) {
+    if (lightResult.intersects) {
         result = lightResult;
+    } else if (entityResult.intersects) {
+        result = entityResult;
     } else {
-        if (entityResult.distance < lightResult.distance) {
-            result = entityResult;
-        } else {
-            result = lightResult;
-        }
+        return null;
     }
 
     if (!result.accurate) {