diff --git a/draw.js b/draw.js
index a926fd6..24152a9 100644
--- a/draw.js
+++ b/draw.js
@@ -443,6 +443,9 @@ var DrawingArea = new Lang.Class({
     },
     
     _startElementGrabber: function() {
+        if (this.elementGrabberHandler)
+            return;
+        
         this.elementGrabberHandler = this.connect('motion-event', (actor, event) => {
             if (this.motionHandler || this.grabbedElementLocked) {
                 this.grabPoint = null;
@@ -1006,10 +1009,6 @@ var DrawingArea = new Lang.Class({
             this.disconnect(this._onKeyboardPopupMenuHandler);
             this._onKeyboardPopupMenuHandler = null;
         }
-        if (this.elementGrabberHandler) {
-            this.disconnect(this.elementGrabberHandler);
-            this.elementGrabberHandler = null;
-        }
         if (this.motionHandler) {
             this.disconnect(this.motionHandler);
             this.motionHandler = null;