diff --git a/examples/editModels.js b/examples/editModels.js
index 93a34b9a3a..53633d3c0c 100644
--- a/examples/editModels.js
+++ b/examples/editModels.js
@@ -691,6 +691,10 @@ function rayPlaneIntersection(pickRay, point, normal) {
 }
 
 function mousePressEvent(event) {
+    if (altIsPressed) {
+        return;
+    }
+    
     mouseLastPosition = { x: event.x, y: event.y };
     modelSelected = false;
     var clickedOverlay = Overlays.getOverlayAtPoint({x: event.x, y: event.y});
@@ -790,6 +794,10 @@ var oldModifier = 0;
 var modifier = 0;
 var wasShifted = false;
 function mouseMoveEvent(event)  {
+    if (altIsPressed) {
+        return;
+    }
+    
     var pickRay = Camera.computePickRay(event.x, event.y);
     
     if (!modelSelected) {
@@ -894,6 +902,10 @@ function mouseMoveEvent(event)  {
 }
 
 function mouseReleaseEvent(event) {
+    if (altIsPressed) {
+        return;
+    }
+    
     modelSelected = false;
     
     glowedModelID.id = -1;
@@ -962,4 +974,16 @@ Menu.menuItemEvent.connect(function(menuItem){
     }
 });
 
+// handling of inspect.js concurrence
+altIsPressed = false;
+Controller.keyPressEvent.connect(function(event) {
+    if (event.text == "ALT") {
+        altIsPressed = true;
+    }
+});
+Controller.keyReleaseEvent.connect(function(event) {
+    if (event.text == "ALT") {
+        altIsPressed = false;
+    }
+});
 
diff --git a/examples/inspect.js b/examples/inspect.js
index 28db1e7735..af63957ec3 100644
--- a/examples/inspect.js
+++ b/examples/inspect.js
@@ -177,30 +177,45 @@ function keyReleaseEvent(event) {
 
 function mousePressEvent(event) {
     if (alt && !isActive) {
-        isActive = true;
         mouseLastX = event.x;
         mouseLastY = event.y;
         
         // Compute trajectories related values
         var pickRay = Camera.computePickRay(mouseLastX, mouseLastY);
-        var intersection = Voxels.findRayIntersection(pickRay);
+        var voxelIntersection = Voxels.findRayIntersection(pickRay);
+        var modelIntersection = Models.findRayIntersection(pickRay);
         
         position = Camera.getPosition();
         
-        avatarTarget = MyAvatar.getTargetAvatarPosition();
-        voxelTarget = intersection.intersection;
-        if (Vec3.length(Vec3.subtract(avatarTarget, position)) < Vec3.length(Vec3.subtract(voxelTarget, position))) {
-            if (avatarTarget.x != 0 || avatarTarget.y != 0 || avatarTarget.z != 0) {
-                center  = avatarTarget;
-            } else {
-                center = voxelTarget;
-            }
-        } else {
-            if (voxelTarget.x != 0 || voxelTarget.y != 0 || voxelTarget.z != 0) {
-                center  = voxelTarget;
-            } else {
-                center = avatarTarget;
-            }
+        var avatarTarget = MyAvatar.getTargetAvatarPosition();
+        var voxelTarget = voxelIntersection.intersection;
+        
+        
+        var distance = -1;
+        var string;
+        
+        if (modelIntersection.intersects && modelIntersection.accurate) {
+            distance = modelIntersection.distance;
+            center = modelIntersection.modelProperties.position;
+            string = "Inspecting model";
+        }
+        
+        if ((distance == -1 || Vec3.length(Vec3.subtract(avatarTarget, position)) < distance) &&
+            (avatarTarget.x != 0 || avatarTarget.y != 0 || avatarTarget.z != 0)) {
+            distance = Vec3.length(Vec3.subtract(avatarTarget, position));
+            center  = avatarTarget;
+            string = "Inspecting avatar";
+        }
+        
+        if ((distance == -1 || Vec3.length(Vec3.subtract(voxelTarget, position)) < distance) &&
+            (voxelTarget.x != 0 || voxelTarget.y != 0 || voxelTarget.z != 0)) {
+            distance = Vec3.length(Vec3.subtract(voxelTarget, position));
+            center  = voxelTarget;
+            string = "Inspecting voxel";
+        }
+        
+        if (distance == -1) {
+            return;
         }
         
         vector = Vec3.subtract(position, center);
@@ -209,6 +224,8 @@ function mousePressEvent(event) {
         altitude = Math.asin(vector.y / Vec3.length(vector));
         
         Camera.keepLookingAt(center);
+        print(string);
+        isActive = true;
     }
 }