diff --git a/composite.cpp b/composite.cpp
index 097d08500f..de674b6c91 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -989,7 +989,7 @@ void Toplevel::addDamageFull()
         return;
 
     damage_region = rect();
-    repaints_region = rect();
+    repaints_region |= rect();
 
     emit damaged(this, rect());
 }
diff --git a/events.cpp b/events.cpp
index 904811864b..1e8ba5008f 100644
--- a/events.cpp
+++ b/events.cpp
@@ -1521,6 +1521,7 @@ void Unmanaged::configureNotifyEvent(XConfigureEvent* e)
         addWorkspaceRepaint(visibleRect());  // damage old area
         QRect old = geom;
         geom = newgeom;
+        emit geometryChanged(); // update shadow region
         addRepaintFull();
         if (old.size() != geom.size())
             discardWindowPixmap();