diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 509e201d47..bf42b300ca 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -82,6 +82,10 @@ void ContextOverlayInterface::setEnabled(bool enabled) {
 bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
     if (_enabled && event.getButton() == PointerEvent::SecondaryButton) {
         if (contextOverlayFilterPassed(entityItemID)) {
+            if (event.getID() == 0) {
+                enableEntityHighlight(entityItemID);
+            }
+
             qCDebug(context_overlay) << "Creating Context Overlay on top of entity with ID: " << entityItemID;
 
             // Add all necessary variables to the stack
@@ -165,6 +169,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
         }
     } else {
         if (!_currentEntityWithContextOverlay.isNull()) {
+            disableEntityHighlight(_currentEntityWithContextOverlay);
             return destroyContextOverlay(_currentEntityWithContextOverlay, event);
         }
         return false;
@@ -226,13 +231,13 @@ void ContextOverlayInterface::contextOverlays_hoverLeaveOverlay(const OverlayID&
 }
 
 void ContextOverlayInterface::contextOverlays_hoverEnterEntity(const EntityItemID& entityID, const PointerEvent& event) {
-    if (contextOverlayFilterPassed(entityID) && _enabled) {
+    if (contextOverlayFilterPassed(entityID) && _enabled && event.getID() != 0) {
         enableEntityHighlight(entityID);
     }
 }
 
 void ContextOverlayInterface::contextOverlays_hoverLeaveEntity(const EntityItemID& entityID, const PointerEvent& event) {
-    if (_currentEntityWithContextOverlay != entityID && _enabled) {
+    if (_currentEntityWithContextOverlay != entityID && _enabled && event.getID() != 0) {
         disableEntityHighlight(entityID);
     }
 }
diff --git a/libraries/render-utils/src/OutlineEffect.h b/libraries/render-utils/src/OutlineEffect.h
index 36dc59f29e..f260345c24 100644
--- a/libraries/render-utils/src/OutlineEffect.h
+++ b/libraries/render-utils/src/OutlineEffect.h
@@ -81,10 +81,10 @@ public:
     float getColorB() const { return color.b; }
 
     glm::vec3 color{ 1.f, 0.7f, 0.2f };
-    float width{ 3.f };
-    float intensity{ 1.f };
-    float fillOpacityUnoccluded{ 0.35f };
-    float fillOpacityOccluded{ 0.1f };
+    float width{ 1.5f };
+    float intensity{ 0.9f };
+    float fillOpacityUnoccluded{ 0.0f };
+    float fillOpacityOccluded{ 0.0f };
     bool glow{ false };
 
 signals:
diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
index eb73b0f908..d2b5f92fde 100644
--- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -148,7 +148,9 @@ Script.include("/~/system/libraries/controllers.js");
             if (mode === "full") {
                 var fullEndToEdit = PICK_WITH_HAND_RAY ? this.fullEnd : fullEnd;
                 fullEndToEdit.dimensions = dim;
-                LaserPointers.editRenderState(laserPointerID, mode, {path: fullPath, end: fullEndToEdit});
+                LaserPointers.editRenderState(laserPointerID, mode, { path: fullPath, end: fullEndToEdit });
+                this.contextOverlayTimer = false;
+                this.destroyContextOverlay();
             } else if (mode === "half") {
                 var halfEndToEdit = PICK_WITH_HAND_RAY ? this.halfEnd : halfEnd;
                 halfEndToEdit.dimensions = dim;