diff --git a/src/shell/focus/mod.rs b/src/shell/focus/mod.rs
index 3c40c9eb..843db923 100644
--- a/src/shell/focus/mod.rs
+++ b/src/shell/focus/mod.rs
@@ -453,6 +453,7 @@ fn update_focus_target(
             .focus_stack
             .get(&seat)
             .last()
+            .or_else(|| shell.active_space(&output).mapped().next())
             .cloned()
             .map(KeyboardFocusTarget::from)
     }