diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index a4392cc6b..7120043b8 100644
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -170,7 +170,7 @@ const GrabHelper = new Lang.Class({
         if (params.grabFocus)
             this._grabFocusCount++;
 
-        if (hadFocus)
+        if (hadFocus || params.grabFocus)
             _navigateActor(newFocus);
 
         return true;