diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 39dd3bc598..fdc14445c5 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1924,12 +1924,17 @@ entityListTool.webView.webEventReceived.connect(function (data) {
                 selectedParticleEntity = ids[0];
                 particleExplorerTool.setActiveParticleEntity(ids[0]);
 
-                particleExplorerTool.webView.webEventReceived.connect(function (data) {
-                    data = JSON.parse(data);
-                    if (data.messageType === "page_loaded") {
-                        particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData));
-                    }
-                });
+                if (Settings.getValue("HUDUIEnabled")) {
+                    particleExplorerTool.webView.webEventReceived.connect(function (data) {
+                        data = JSON.parse(data);
+                        if (data.messageType === "page_loaded") {
+                            particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData));
+                        }
+                    });
+                } else {
+                    // in the tablet version, the page was loaded earlier
+                    particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData));
+                }
             } else {
                 selectedParticleEntity = 0;
                 particleExplorerTool.destroyWebView();
diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 2471de98d3..596620b59a 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1034,30 +1034,13 @@ SelectionDisplay = (function() {
                 that.triggered = true;
                 if (activeHand !== hand) {
                     // No switching while the other is already triggered, so no need to release.
-                    activeHand = (activeHand === Controller.Standard.RightHand) ? Controller.Standard.LeftHand : Controller.Standard.RightHand;
+                    activeHand = (activeHand === Controller.Standard.RightHand) ?
+                        Controller.Standard.LeftHand : Controller.Standard.RightHand;
                 }
                 if (Reticle.pointingAtSystemOverlay || Overlays.getOverlayAtPoint(Reticle.position)) {
                     return;
                 }
-                var eventResult = that.mousePressEvent({});
-                // if (!eventResult || (eventResult === 'selectionBox')) {
-                //     var pickRay = controllerComputePickRay();
-                //     if (pickRay) {
-                //         var entityIntersection = Entities.findRayIntersection(pickRay, true);
-
-
-                //         var overlayIntersection = Overlays.findRayIntersection(pickRay);
-                //         if (entityIntersection.intersects &&
-                //             (!overlayIntersection.intersects || (entityIntersection.distance < overlayIntersection.distance))) {
-
-                //             if (HMD.tabletID === entityIntersection.entityID) {
-                //                 return;
-                //             }
-
-                //             selectionManager.setSelections([entityIntersection.entityID]);
-                //         }
-                //     }
-                // }
+                that.mousePressEvent({});
             } else if (that.triggered && (value < that.TRIGGER_OFF_VALUE)) {
                 that.triggered = false;
                 that.mouseReleaseEvent({});
@@ -2065,7 +2048,7 @@ SelectionDisplay = (function() {
                 Overlays.editOverlay(grabberPointLightL, {
                     visible: false
                 });
-                Overlays.editOverlay(grabberPointLightR, {
+                Overlays.editOverlay(grabberPointLightR, {
                     visible: false
                 });
                 Overlays.editOverlay(grabberPointLightF, {
diff --git a/scripts/system/particle_explorer/particleExplorer.html b/scripts/system/particle_explorer/particleExplorer.html
index 260d8a7813..d12ceac14b 100644
--- a/scripts/system/particle_explorer/particleExplorer.html
+++ b/scripts/system/particle_explorer/particleExplorer.html
@@ -76,4 +76,4 @@ body{
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/scripts/system/particle_explorer/particleExplorer.js b/scripts/system/particle_explorer/particleExplorer.js
index 4fd0978a84..44fa242435 100644
--- a/scripts/system/particle_explorer/particleExplorer.js
+++ b/scripts/system/particle_explorer/particleExplorer.js
@@ -358,9 +358,12 @@ function listenForSettingsUpdates() {
                 settings[key] = value;
             });
 
-            loadGUI();
+            if (gui) {
+                manuallyUpdateDisplay();
+            } else {
+                loadGUI();
+            }
         }
-
     });
 }
 
@@ -505,4 +508,4 @@ function registerDOMElementsForListenerBlocking() {
             });
         });
     });
-}
\ No newline at end of file
+}
diff --git a/scripts/system/particle_explorer/particleExplorerTool.js b/scripts/system/particle_explorer/particleExplorerTool.js
index e592161414..0be7c6b588 100644
--- a/scripts/system/particle_explorer/particleExplorerTool.js
+++ b/scripts/system/particle_explorer/particleExplorerTool.js
@@ -58,8 +58,9 @@ ParticleExplorerTool = function() {
         that.activeParticleEntity = id;
     }
 
+    if (Settings.getValue("HUDUIEnabled")) {
+        that.createWebView();
+    }
 
     return that;
-
-
 };