diff --git a/src/core/window.c b/src/core/window.c
index cf5cd7daa..c1dbb7be8 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5997,7 +5997,8 @@ meta_window_focus (MetaWindow  *window,
               window->desc, window->input, window->take_focus);
 
   if (window->display->grab_window &&
-      window->display->grab_window->all_keys_grabbed)
+      window->display->grab_window->all_keys_grabbed &&
+      !window->display->grab_window->unmanaging)
     {
       meta_topic (META_DEBUG_FOCUS,
                   "Current focus window %s has global keygrab, not focusing window %s after all\n",