diff --git a/examples/inspect.js b/examples/inspect.js
index ff0925db97..d730a7e53f 100644
--- a/examples/inspect.js
+++ b/examples/inspect.js
@@ -158,6 +158,11 @@ function handleModes() {
          avatarOrientation.w != MyAvatar.orientation.w)) {
         newMode = noMode;
     }
+
+    if (mode == noMode && newMode != noMode && Camera.mode == "independent") {
+        newMode = noMode;
+    }
+
     // if leaving noMode
     if (mode == noMode && newMode != noMode) {
         saveCameraState();
diff --git a/examples/libraries/entityCameraTool.js b/examples/libraries/entityCameraTool.js
index b9170dc25d..f5095bb149 100644
--- a/examples/libraries/entityCameraTool.js
+++ b/examples/libraries/entityCameraTool.js
@@ -80,7 +80,8 @@ CameraManager = function() {
     that.lastMousePosition = { x: 0, y: 0 };
 
     that.enable = function() {
-        if (that.enabled) return;
+        if (Camera.mode == "independent" || that.enabled) return;
+
         that.enabled = true;
         that.mode = MODE_INACTIVE;