diff --git a/shell_client.cpp b/shell_client.cpp
index 391707cab1..7128cebd43 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -357,6 +357,9 @@ void ShellClient::createDecoration(const QRect &oldGeom)
         );
     }
     setDecoration(decoration);
+    // TODO: ensure the new geometry still fits into the client area (e.g. maximized windows)
+    doSetGeometry(QRect(oldGeom.topLeft(), m_clientSize + QSize(decoration->borderLeft() + decoration->borderRight(),
+                                                               decoration->borderBottom() + decoration->borderTop())));
 
     emit geometryShapeChanged(this, oldGeom);
 }