diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index bc58ece5..0c7433a1 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -2632,16 +2632,15 @@ impl Shell {
     pub fn next_focus<'a>(&self, direction: FocusDirection, seat: &Seat<State>) -> FocusResult {
         let overview = self.overview_mode().0;
         let output = seat.active_output();
-        let workspace = self.active_space(&output);
-
-        if workspace.fullscreen.is_some() {
-            return FocusResult::None;
-        }
 
         let Some(target) = seat.get_keyboard().unwrap().current_focus() else {
             return FocusResult::None;
         };
 
+        if matches!(target, KeyboardFocusTarget::Fullscreen(_)) {
+            return FocusResult::None;
+        }
+
         let set = self.workspaces.sets.get(&output).unwrap();
         let sticky_layer = &set.sticky_layer;
         let workspace = &set.workspaces[set.active];