diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index 315e2d49b..fe3a121ce 100644
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -311,7 +311,8 @@ const GrabHelper = new Lang.Class({
 
         if (hadFocus) {
             let poppedGrab = poppedGrabs[0];
-            _navigateActor(poppedGrab.savedFocus);
+            if (poppedGrab.savedFocus)
+                poppedGrab.savedFocus.grab_key_focus();
         }
     },