diff --git a/scripts/vr-edit/vr-edit.js b/scripts/vr-edit/vr-edit.js
index 64b116993c..f69d2c3690 100644
--- a/scripts/vr-edit/vr-edit.js
+++ b/scripts/vr-edit/vr-edit.js
@@ -1220,7 +1220,7 @@
 
             wasTriggerClicked = isTriggerClicked;
             wasGripClicked = isGripClicked;
-            isAutoGrab = isAutoGrab && isTriggerClicked;
+            isAutoGrab = isAutoGrab && isTriggerClicked && !isGripClicked;
 
             if (DEBUG && editorState !== previousState) {
                 debug(side, EDITOR_STATE_STRINGS[editorState]);