diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 1512ab49..02f37475 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -4658,6 +4658,8 @@ impl Shell {
                 stack.remove_window(&surface);
                 surface
             } else {
+                mapped.set_fullscreen(true);
+
                 if let Some(state) = mapped.maximized_state.lock().unwrap().take() {
                     mapped.set_maximized(false);
                     set.sticky_layer.map_internal(
@@ -4699,6 +4701,8 @@ impl Shell {
                 return None;
             }
 
+            mapped.set_fullscreen(true);
+
             let from = workspace.element_geometry(&mapped).unwrap();
             let (surface, state) = workspace.unmap_surface(surface).unwrap();
             window = surface;