diff --git a/interface/resources/qml/AudioScope.qml b/interface/resources/qml/AudioScopeUI.qml
similarity index 100%
rename from interface/resources/qml/AudioScope.qml
rename to interface/resources/qml/AudioScopeUI.qml
diff --git a/scripts/developer/utilities/audio/audioScope.js b/scripts/developer/utilities/audio/audioScope.js
index 00c9e4b725..63cbf0a6e2 100644
--- a/scripts/developer/utilities/audio/audioScope.js
+++ b/scripts/developer/utilities/audio/audioScope.js
@@ -1,4 +1,4 @@
-var qml = Script.resourcesPath() + '/qml/AudioScope.qml';
+var qml = Script.resourcesPath() + '/qml/AudioScopeUI.qml';
 var window = new OverlayWindow({
     title: 'Audio Scope',
     source: qml,
@@ -14,4 +14,4 @@ window.closed.connect(function () {
 	AudioScope.setServerEcho(false);
 	AudioScope.selectAudioScopeFiveFrames();
 	Script.stop(); 
-});
\ No newline at end of file
+});
diff --git a/scripts/system/controllers/controllerModules/farActionGrabEntity.js b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
index 09cea58cea..07450e54ba 100644
--- a/scripts/system/controllers/controllerModules/farActionGrabEntity.js
+++ b/scripts/system/controllers/controllerModules/farActionGrabEntity.js
@@ -475,7 +475,7 @@ Script.include("/~/system/libraries/Xform.js");
                         entityID = targetEntity.id;
                         targetProps = targetEntity.props;
 
-                        if (entityIsGrabbable(targetProps)) {
+                        if (entityIsGrabbable(targetProps) || entityIsGrabbable(this.targetObject.entityProps)) {
                             if (!entityIsDistanceGrabbable(targetProps)) {
                                 this.targetObject.makeDynamic();
                             }