diff --git a/src/servers/app/Decorator.cpp b/src/servers/app/Decorator.cpp
index 6f74281cea..e8ec2195d7 100644
--- a/src/servers/app/Decorator.cpp
+++ b/src/servers/app/Decorator.cpp
@@ -99,8 +99,6 @@ Decorator::SetFlags(uint32 flags, BRegion* updateRegion)
 	if (flags & B_NOT_RESIZABLE)
 		flags |= B_NOT_H_RESIZABLE | B_NOT_V_RESIZABLE;
 
-	fFlags = flags;
-
 	fFootprintValid = false;
 		// the border might have changed (smaller/larger tab)
 	_SetFlags(flags, updateRegion);
@@ -124,8 +122,6 @@ void
 Decorator::SetLook(DesktopSettings& settings, window_look look,
 	BRegion* updateRect)
 {
-	fLook = look;
-
 	fFootprintValid = false;
 		// the border very likely changed
 	_SetLook(settings, look, updateRect);
@@ -628,12 +624,14 @@ void
 Decorator::_SetLook(DesktopSettings& settings, window_look look,
 	BRegion* updateRect)
 {
+	fLook = look;
 }
 
 
 void
 Decorator::_SetFlags(uint32 flags, BRegion* updateRegion)
 {
+	fFlags = flags;
 }
 
 
diff --git a/src/servers/app/DefaultDecorator.cpp b/src/servers/app/DefaultDecorator.cpp
index 4bb3bccbed..6856cc12bf 100644
--- a/src/servers/app/DefaultDecorator.cpp
+++ b/src/servers/app/DefaultDecorator.cpp
@@ -790,6 +790,8 @@ DefaultDecorator::_SetLook(DesktopSettings& settings, window_look look,
 	if (updateRegion != NULL)
 		updateRegion->Include(&GetFootprint());
 
+	fLook = look;
+
 	_UpdateFont(settings);
 	_InvalidateBitmaps();
 	_DoLayout();
@@ -808,6 +810,7 @@ DefaultDecorator::_SetFlags(uint32 flags, BRegion* updateRegion)
 	if (updateRegion != NULL)
 		updateRegion->Include(&GetFootprint());
 
+	fFlags = flags;
 	_DoLayout();
 
 	if (updateRegion != NULL)