diff --git a/src/servers/app/WindowLayer.cpp b/src/servers/app/WindowLayer.cpp
index f1dcfeba28..18448f7ccd 100644
--- a/src/servers/app/WindowLayer.cpp
+++ b/src/servers/app/WindowLayer.cpp
@@ -1206,6 +1206,8 @@ WindowLayer::SetLook(window_look look, BRegion* updateRegion)
 		// we need a new decorator
 		fDecorator = gDecorManager.AllocateDecorator(fDesktop, Frame(),
 			Title(), fLook, fFlags);
+		if (IsFocus())
+			fDecorator->SetFocus(true);
 	}
 
 	fLook = look;