diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml
index c4b6c2aee1..9cb1add704 100644
--- a/interface/resources/qml/LoginDialog/SignInBody.qml
+++ b/interface/resources/qml/LoginDialog/SignInBody.qml
@@ -84,11 +84,9 @@ Item {
             height: undefined // invalidate so that the image's size sets the height
             focus: true
 
-            style: OriginalStyles.ButtonStyle {
-                background: Image {
-                    id: buttonImage
-                    source: "../../images/steam-sign-in.png"
-                }
+            background: Image {
+                id: buttonImage
+                source: "../../images/steam-sign-in.png"
             }
             onClicked: signInBody.login()
         }
diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
index cc884cdbc7..66cd197abd 100644
--- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -564,6 +564,9 @@ Script.include("/~/system/libraries/Xform.js");
                     }
                 } else if (this.distanceRotating) {
                     this.distanceRotate(otherFarGrabModule);
+                } else if (this.highlightedEntity) {
+                    Selection.removeFromSelectedItemsList(DISPATCHER_HOVERING_LIST, "entity", this.highlightedEntity);
+                    this.highlightedEntity = null;
                 }
             }
             return this.exitIfDisabled(controllerData);
diff --git a/scripts/system/controllers/controllerModules/mouseHighlightEntities.js b/scripts/system/controllers/controllerModules/mouseHighlightEntities.js
index 3180e58e2c..ac57c8691f 100644
--- a/scripts/system/controllers/controllerModules/mouseHighlightEntities.js
+++ b/scripts/system/controllers/controllerModules/mouseHighlightEntities.js
@@ -63,6 +63,9 @@
                             this.highlightedEntity = targetEntityID;
                         }
                     }
+                } else if (this.highlightedEntity) {
+                    dispatcherUtils.unhighlightTargetEntity(this.highlightedEntity);
+                    this.highlightedEntity = null;
                 }
             }