diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index 9d700894..bf346ce4 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -116,6 +116,11 @@ impl Workspace {
         if was_floating || was_tiling {
             assert!(was_floating != was_tiling);
         }
+
+        if mapped.is_maximized() || mapped.is_fullscreen() {
+            self.unmaximize_request(&mapped.active_window());
+        }
+
         self.focus_stack
             .0
             .values_mut()