diff --git a/package.json b/package.json
index 744b8d81544a7a5fafee47af0f431b6753e7c665..c5648ef06b97b6e5e09d0fa0b2cd042ff373c248 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "react-intl": "^2.4.0",
     "react-router-dom": "^4.2.2",
     "screenfull": "^3.3.2",
-    "super-hands": "https://github.com/mozillareality/aframe-super-hands-component#hubs/master",
+    "super-hands": "https://github.com/mozillareality/aframe-super-hands-component#feature/drawing-work-branch",
     "uuid": "^3.2.1",
     "webrtc-adapter": "^6.0.2"
   },
diff --git a/src/components/grabbable-toggle.js b/src/components/grabbable-toggle.js
index ef5f41f98acd2284443bf1fdc78a487d51dcb4d0..54b62bc574b4a61be7843c4fefda61e165a231b1 100644
--- a/src/components/grabbable-toggle.js
+++ b/src/components/grabbable-toggle.js
@@ -6,6 +6,8 @@ AFRAME.registerComponent("grabbable-toggle", {
 
   init() {
     this.toggle = false;
+    this.currentHand = null;
+
     this.onGrabEnd = this.onGrabEnd.bind(this);
     this.el.addEventListener("grab-end", this.onGrabEnd);
     this.el.classList.add("sticky");
@@ -18,11 +20,19 @@ AFRAME.registerComponent("grabbable-toggle", {
 
   onGrabEnd(e) {
     const type = e.detail && e.detail.buttonEvent ? e.detail.buttonEvent.type : null;
+
+    if (this.toggle && this.currentHand !== null && this.currentHand !== e.detail.hand) {
+      this.toggle = false;
+      this.currentHand = null;
+    }
+
     if ((this.isPrimaryRelease(type) && !this.toggle) || this.isSecondaryRelease(type)) {
       this.toggle = true;
+      this.currentHand = e.detail.hand;
       e.stopImmediatePropagation(); //prevents grabbable from calling preventDefault
     } else if (this.toggle && this.isPrimaryRelease(type)) {
       this.toggle = false;
+      this.currentHand = null;
     }
   },
 
diff --git a/yarn.lock b/yarn.lock
index 2ace6bd5d29b63a9b6432ae83e170fa9ebaf00e0..5ce48fa1bb5cb85cb23ee06224b4bb03d48fda7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7858,9 +7858,9 @@ subarg@^1.0.0:
   dependencies:
     minimist "^1.1.0"
 
-"super-hands@https://github.com/mozillareality/aframe-super-hands-component#hubs/master":
+"super-hands@https://github.com/mozillareality/aframe-super-hands-component#feature/drawing-work-branch":
   version "3.0.0"
-  resolved "https://github.com/mozillareality/aframe-super-hands-component#ae01ff079032177fd8cd16a2881d459b71318207"
+  resolved "https://github.com/mozillareality/aframe-super-hands-component#5d82ce660b6e8f2ee49a368248fd4d1c4627b8c8"
 
 supports-color@1.3.1:
   version "1.3.1"