diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index 7e86c8439..a35ceb400 100644
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -77,9 +77,12 @@ const GrabHelper = new Lang.Class({
     },
 
     _isWithinGrabbedActor: function(actor) {
+       let currentActor = this.currentGrab.actor;
         while (actor) {
             if (this._actors.indexOf(actor) != -1)
                 return true;
+            if (actor == currentActor)
+                return true;
             actor = actor.get_parent();
         }
         return false;