diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 755d9589..2e81c6a9 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -2816,6 +2816,9 @@ impl Shell {
         if window.is_maximized(true) {
             self.unmaximize_request(window);
         } else {
+            if window.is_fullscreen(true) {
+                return;
+            }
             self.maximize_request(window, seat);
         }
     }