diff --git a/src/core/window.c b/src/core/window.c
index 07f826bb5..d17f8838b 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -4628,6 +4628,7 @@ meta_window_focus (MetaWindow  *window,
               window->desc, window->input, window->take_focus);
 
   if (window->display->grab_window &&
+      window->display->grab_window != window &&
       window->display->grab_window->all_keys_grabbed &&
       !window->display->grab_window->unmanaging)
     {