diff --git a/src/Window.cc b/src/Window.cc
index 9df48a2e..56cbd965 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1500,6 +1500,12 @@ void FluxboxWindow::setMaximizedState(int type) {
     if (isResizing())
         stopResizing();
 
+    if (isShaded()) {
+        // do not call ::shade() here to trigger frame().applyState() and
+        // stateSig().notfiy() only once
+        m_state.shaded = false;
+    }
+
     m_state.maximized = type;
     frame().applyState();