diff --git a/shell_client.cpp b/shell_client.cpp
index 44e034247f..0b81a72a46 100644
--- a/shell_client.cpp
+++ b/shell_client.cpp
@@ -258,8 +258,14 @@ void ShellClient::setGeometry(const QRect &rect)
     if (geom == rect) {
         return;
     }
+    if (!m_unmapped) {
+        addWorkspaceRepaint(visibleRect());
+    }
     const QRect old = geom;
     geom = rect;
+    if (!m_unmapped) {
+        addWorkspaceRepaint(visibleRect());
+    }
     emit geometryChanged();
     emit geometryShapeChanged(this, old);
 }