diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 005636b2..4685fc14 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -531,6 +531,13 @@ impl Shell {
             return;
         }
 
+        {
+            let map = layer_map_for_output(output);
+            for surface in map.layers() {
+                surface.layer_surface().send_close();
+            }
+        }
+
         let mut state = self.workspace_state.update();
         self.outputs.retain(|o| o != output);