diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 8e52c73c..28b87e61 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -722,6 +722,9 @@ impl Workspaces {
                     if &seat.active_output() == output {
                         seat.set_active_output(&new_output);
                     }
+                    if seat.focused_output().as_ref() == Some(output) {
+                        seat.set_focused_output(None);
+                    }
                 }
 
                 let new_set = self.sets.get_mut(&new_output).unwrap();