diff --git a/scripts/system/controllers/mouseLook.js b/scripts/system/controllers/mouseLook.js
index 0e37144e12..c4790dd87c 100644
--- a/scripts/system/controllers/mouseLook.js
+++ b/scripts/system/controllers/mouseLook.js
@@ -4,45 +4,61 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
 */
 (function() { // BEGIN LOCAL_SCOPE
 
-	var oldMode;
-
-	var tabletUp;
-
 	var away;
 
+	var hmd;
+
 	var mouseLookEnabled = false;
 
+	var oldMode;
+
 	var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+
+	var tabletUp;
+
+	var tempOff = false;
 	
-	if (mouseLookEnabled) {
-		if (!tablet.tabletShown){
-			mouseLookOn();
+	hmd = AvatarInputs.isHMD;
+
+	if (!hmd){
+		if (mouseLookEnabled) {
+			if (!tablet.tabletShown){
+				Window.displayAnnouncement("Mouse look: ON");
+				mouseLookOn();
+			} else {
+				Window.displayAnnouncement("Tablet is up – mouse look temporarily off.");
+			}
 		}
 	}
 
 	Controller.keyPressEvent.connect(onKeyPressEvent);
 
 	function onKeyPressEvent(event) {
-		if (event.text === 'm') {
-			if (mouseLookEnabled) {
-				if (!Camera.getCaptureMouse()){
-					Window.displayAnnouncement("Mouse look: ON");
-					mouseLookOn();
-				} else {
-					Window.displayAnnouncement("Mouse look: TEMPORARILY OFF");
-					mouseLookOff();		
+		if (!hmd){
+			if (event.text === 'm') {
+				if (mouseLookEnabled) {
+					if (!Camera.getCaptureMouse()){
+						tempOff = false;
+						Window.displayAnnouncement("Mouse look: ON");
+						mouseLookOn();
+					} else {
+						tempOff = true;
+						Window.displayAnnouncement("Mouse look: TEMPORARILY OFF");
+						mouseLookOff();
+					}
 				}
 			}
-		}
-		if (event.text === 'M') {
-			if (!mouseLookEnabled){
-				Window.displayAnnouncement("Mouse look: ENABLED")
-				mouseLookEnabled = true;
-				mouseLookOn();
-			} else {
-				Window.displayAnnouncement("Mouse look: DISABLED")
-				mouseLookEnabled = false;
-				mouseLookOff();		
+			if (event.text === 'M') {
+				if (!mouseLookEnabled){
+					Window.displayAnnouncement("Mouse look: ENABLED")
+					mouseLookEnabled = true;
+					mouseLookOn();
+				} else {
+					Window.displayAnnouncement("Mouse look: DISABLED")
+					mouseLookEnabled = false;
+					tempOff = false;
+					mouseLookOff();		
+				}
 			}
 		}
 	}
@@ -50,19 +66,25 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
 	tablet.tabletShownChanged.connect(onTabletShownChanged);
 
 	function onTabletShownChanged() {
-		if (mouseLookEnabled) {
-			if (!tablet.toolbarMode) {
-				if (tablet.tabletShown) {
-					tabletUp = true;
-					if (!away) {
-						Window.displayAnnouncement("Tablet is up – mouse look temporarily off.");
-						mouseLookOff();
-					}
-				} else if (!tablet.tabletShown) {
-					tabletUp = false;
-					if (!away) {
-						Window.displayAnnouncement("Tablet hidden – mouse look on.");
-						mouseLookOn();
+		if (!hmd) {
+			if (mouseLookEnabled) {
+				if (!tablet.toolbarMode) {
+					if (tablet.tabletShown) {
+						tabletUp = true;
+						if (!tempOff) {
+							if (!away) {
+								Window.displayAnnouncement("Tablet is up – mouse look temporarily off.");
+								mouseLookOff();
+							}
+						}
+					} else if (!tablet.tabletShown) {
+						tabletUp = false;
+						if (!tempOff) {
+							if (!away) {
+								Window.displayAnnouncement("Tablet hidden – mouse look on.");
+								mouseLookOn();
+							}
+						}
 					}
 				}
 			}
@@ -72,11 +94,14 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
 	MyAvatar.wentAway.connect(onWentAway);
 
 	function onWentAway() {
-		if (mouseLookEnabled) {
-			away = true;
-			if (!tabletUp){
-				Window.displayAnnouncement("Away state ON – mouse look temporarily off.")
-				mouseLookOff()
+		if (!hmd) {
+			if (mouseLookEnabled) {
+				away = true;
+				if (!tabletUp){
+					Window.displayAnnouncement("Away state ON – mouse look temporarily off.")
+					tempOff = false;
+					mouseLookOff()
+				}
 			}
 		}
 	}
@@ -84,11 +109,31 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
 	MyAvatar.wentActive.connect(onWentActive);
 
 	function onWentActive() {
+		if (!hmd) {
+			if (mouseLookEnabled) {
+				away = false;
+				if (!tabletUp) {
+					Window.displayAnnouncement("Away state OFF – mouse look on.");
+					mouseLookOn();
+				}
+			}
+		}
+	}
+
+	AvatarInputs.isHMDChanged.connect(onIsHMDChanged);
+
+	function onIsHMDChanged() {
 		if (mouseLookEnabled) {
-			away = false;
-			if (!tabletUp) {
-				Window.displayAnnouncement("Away state OFF – mouse look on.");
-				mouseLookOn();
+			if (AvatarInputs.isHMD) {
+				hmd = true;
+				mouseLookOff();
+			} else {
+				hmd = false;
+				if (!tempOff) {
+					if (!tabletUp) {
+						mouseLookOn();
+					}
+				}
 			}
 		}
 	}
@@ -120,8 +165,9 @@ by rampa3 (https://github.com/rampa3) and vegaslon (https://github.com/vegaslon)
 		tablet.tabletShownChanged.disconnect(onTabletShownChanged);
 		MyAvatar.wentAway.disconnect(onWentAway);
 		MyAvatar.wentActive.disconnect(onWentActive);
+		AvatarInputs.isHMDChanged.disconnect(onIsHMDChanged);
 		Camera.modeUpdated.disconnect(onCameraModeUpdated);
-		Script.scriptEnding.disconnect();
+		Script.scriptEnding.disconnect(onScriptEnding);
 	}
 
 }()); // END LOCAL_SCOPE
\ No newline at end of file