diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index c698dcbe..c4015e47 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -129,6 +129,7 @@ impl Workspace {
         for window in dead_output_windows {
             self.unfullscreen_request(&window);
         }
+        self.fullscreen.retain(|_, w| w.toplevel().alive());
         self.layout.refresh(&mut self.space);
         self.space.refresh();
     }