diff --git a/src/core/stack.c b/src/core/stack.c
index 6dd1ccb9e..7ab590c98 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -1224,6 +1224,9 @@ get_default_focus_window (MetaStack     *stack,
       if (window->unmaps_pending > 0)
         continue;
 
+      if (window->unmanaging)
+        continue;
+
       if (!meta_window_is_focusable (window))
         continue;
 
diff --git a/src/core/window.c b/src/core/window.c
index 5f5269b7c..c112c7d59 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -8529,9 +8529,6 @@ meta_window_shortcuts_inhibited (MetaWindow         *window,
 gboolean
 meta_window_is_focusable (MetaWindow *window)
 {
-  if (window->unmanaging)
-    return FALSE;
-
   return META_WINDOW_GET_CLASS (window)->is_focusable (window);
 }