diff --git a/src/core/window.c b/src/core/window.c
index d5c92102b..d42a373c7 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -3750,8 +3750,6 @@ meta_window_activate_full (MetaWindow     *window,
     meta_window_focus (window, timestamp);
   else
     meta_workspace_activate_with_focus (window->workspace, window, timestamp);
-
-  meta_window_check_alive (window, timestamp);
 }
 
 /* This function exists since most of the functionality in window_activate
@@ -4772,6 +4770,8 @@ meta_window_focus (MetaWindow  *window,
       return;
     }
 
+  meta_window_check_alive (window, timestamp);
+
   META_WINDOW_GET_CLASS (window)->focus (window, timestamp);
 
   if (window->display->event_route == META_EVENT_ROUTE_NORMAL)