diff --git a/src/servers/app/Window.cpp b/src/servers/app/Window.cpp
index 508c95c64a..46c86d0084 100644
--- a/src/servers/app/Window.cpp
+++ b/src/servers/app/Window.cpp
@@ -2084,8 +2084,10 @@ Window::DetachFromWindowStack(bool ownStackNeeded)
 
 	BRegion dirty;
 	::Decorator* decorator = fCurrentStack->Decorator();
-	if (decorator != NULL)
+	if (decorator != NULL) {
 		decorator->RemoveTab(index, &dirty);
+		decorator->SetTopTap(fCurrentStack->LayerOrder().CountItems() - 1);
+	}
 
 	Window* remainingTop = fCurrentStack->TopLayerWindow();
 	if (remainingTop != NULL) {