diff --git a/src/servers/app/Window.cpp b/src/servers/app/Window.cpp
index d1fb9c9746..ac4010afe6 100644
--- a/src/servers/app/Window.cpp
+++ b/src/servers/app/Window.cpp
@@ -2111,10 +2111,10 @@ Window::DetachFromWindowStack(bool ownStackNeeded)
 	// propagate focus to the new decorator
 	SetFocus(IsFocus());
 
-	fDesktop->RebuildAndRedrawAfterWindowChange(this, dirty);
-	if (remainingTop != NULL)
-		fDesktop->MarkDirty(remainingTop->VisibleRegion());
-
+	if (remainingTop != NULL) {
+		dirty.Include(&remainingTop->VisibleRegion());
+		fDesktop->RebuildAndRedrawAfterWindowChange(remainingTop, dirty);
+	}
 	return true;
 }