diff --git a/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js b/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
index 949fdbb072..e30419f45e 100644
--- a/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
+++ b/scripts/system/controllers/controllerModules/webSurfaceLaserInput.js
@@ -50,21 +50,28 @@ Script.include("/~/system/libraries/controllers.js");
             return this.hand === RIGHT_HAND ? leftOverlayLaserInput : rightOverlayLaserInput;
         };
 
-        this.isPointingAtWebEntity = function(controllerData) {
+        this.isPointingAtTabletOrWeb = function(controllerData, triggerPressed) {
             var intersection = controllerData.rayPicks[this.hand];
-            var entityProperty = Entities.getEntityProperties(intersection.objectID);
-            var entityType = entityProperty.type;
-            if ((intersection.type === Picks.INTERSECTED_ENTITY && entityType === "Web")) {
-                return true;
+			if (intersection.type === Picks.INTERSECTED_OVERLAY) {
+				var objectID = intersection.objectID;
+				if ((HMD.tabletScreenID && objectID === HMD.tabletScreenID) || 
+					(HMD.homeButtonID && objectID === HMD.homeButtonID)) {
+					return true;
+				} else {
+					var overlayType = Overlays.getOverlayType(objectID);
+					if (overlayType === "web3d") {
+						return true;
+					}
+				}
+			} else if (intersection.type === Picks.INTERSECTED_ENTITY) {
+                var entityProperty = Entities.getEntityProperties(intersection.objectID);
+                var entityType = entityProperty.type;
+                var isLocked = entityProperty.locked;
+                return entityType === "Web" && (!isLocked || triggerPressed);
             }
             return false;
         };
 
-        this.isPointingAtOverlay = function(controllerData) {
-            var intersection = controllerData.rayPicks[this.hand];
-            return intersection.type === Picks.INTERSECTED_OVERLAY;
-        };
-
         this.deleteContextOverlay = function() {
             var farGrabModule = getEnabledModuleByName(this.hand === RIGHT_HAND
                 ? "RightFarActionGrabEntity" : "LeftFarActionGrabEntity");
@@ -92,10 +99,10 @@ Script.include("/~/system/libraries/controllers.js");
         this.isReady = function(controllerData) {
             var otherModuleRunning = this.getOtherModule().running;
             otherModuleRunning = otherModuleRunning && this.getDominantHand() !== this.hand; // Auto-swap to dominant hand.
-            var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE
-                && controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE;
-            if ((!otherModuleRunning || isTriggerPressed)
-                    && (this.isPointingAtOverlay(controllerData) || this.isPointingAtWebEntity(controllerData))) {
+            var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE &&
+								   controllerData.triggerValues[this.otherHand] <= TRIGGER_OFF_VALUE;
+			var allowThisModule = !otherModuleRunning || isTriggerPressed;
+            if (allowThisModule && this.isPointingAtTabletOrWeb(controllerData, isTriggerPressed)) {
                 this.updateAllwaysOn();
                 if (isTriggerPressed) {
                     this.dominantHandOverride = true; // Override dominant hand.
@@ -113,9 +120,10 @@ Script.include("/~/system/libraries/controllers.js");
             otherModuleRunning = otherModuleRunning && this.getDominantHand() !== this.hand; // Auto-swap to dominant hand.
             otherModuleRunning = otherModuleRunning || this.getOtherModule().dominantHandOverride; // Override dominant hand.
             var grabModuleNeedsToRun = this.grabModuleWantsNearbyOverlay(controllerData);
-            if (!otherModuleRunning && !grabModuleNeedsToRun && (controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE
-                || this.parameters.handLaser.allwaysOn
-                    && (this.isPointingAtOverlay(controllerData) || this.isPointingAtWebEntity(controllerData)))) {
+			var allowThisModule = !otherModuleRunning && !grabModuleNeedsToRun;
+			var isTriggerPressed = controllerData.triggerValues[this.hand] > TRIGGER_OFF_VALUE;
+			var laserOn = isTriggerPressed || this.parameters.handLaser.allwaysOn;
+            if (allowThisModule && (laserOn && this.isPointingAtTabletOrWeb(controllerData, isTriggerPressed))) {
                 this.running = true;
                 return makeRunningValues(true, [], []);
             }