diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml
index ec803fd919..57c3424d78 100644
--- a/interface/resources/qml/hifi/tablet/TabletRoot.qml
+++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml
@@ -19,7 +19,7 @@ Item {
 
     SoundEffect {
         id: buttonClickSound
-        source: "../../../sounds/button-click.wav"
+        source: "../../../sounds/Gamemaster-Audio-button-click.wav"
     }
 
     function playButtonClickSound() {
diff --git a/interface/resources/sounds/Gamemaster-Audio-button-click.wav b/interface/resources/sounds/Gamemaster-Audio-button-click.wav
new file mode 100644
index 0000000000..b3bb6a9cb1
Binary files /dev/null and b/interface/resources/sounds/Gamemaster-Audio-button-click.wav differ
diff --git a/interface/resources/sounds/button-click.wav b/interface/resources/sounds/button-click.wav
deleted file mode 100644
index 82de1bea28..0000000000
Binary files a/interface/resources/sounds/button-click.wav and /dev/null differ
diff --git a/scripts/system/controllers/handControllerGrab.js b/scripts/system/controllers/handControllerGrab.js
index 5faed900a0..2df92d21bb 100644
--- a/scripts/system/controllers/handControllerGrab.js
+++ b/scripts/system/controllers/handControllerGrab.js
@@ -2040,8 +2040,8 @@ function MyController(hand) {
     this.ensureDynamic = function() {
         // if we distance hold something and keep it very still before releasing it, it ends up
         // non-dynamic in bullet.  If it's too still, give it a little bounce so it will fall.
-        var props = Entities.getEntityProperties(this.grabbedEntity, ["velocity", "dynamic"]);
-        if (props.dynamic) {
+        var props = Entities.getEntityProperties(this.grabbedEntity, ["velocity", "dynamic", "parentID"]);
+        if (props.dynamic && props.parentID == NULL_UUID) {
             var velocity = props.velocity;
             if (Vec3.length(velocity) < 0.05) { // see EntityMotionState.cpp DYNAMIC_LINEAR_VELOCITY_THRESHOLD
                 velocity = { x: 0.0, y: 0.2, z:0.0 };