diff --git a/src/servers/app/WinBorder.cpp b/src/servers/app/WinBorder.cpp
index 777493cd19..500b332bcc 100644
--- a/src/servers/app/WinBorder.cpp
+++ b/src/servers/app/WinBorder.cpp
@@ -288,9 +288,6 @@ WinBorder::SetName(const char* name)
 	// and redraw it.
 
 	if (fDecorator) {
-
-// TODO: Make sure this works!!
-
 		// before the change
 		BRegion invalid(fDecorator->GetTabRect());
 
@@ -299,6 +296,11 @@ WinBorder::SetName(const char* name)
 		// after the change
 		invalid.Include(fDecorator->GetTabRect());
 
+		// TODO: still doesn't look good (visually), but at least it works
+		fRebuildDecRegion = true;
+		GetRootLayer()->MarkForRebuild(invalid);
+		GetRootLayer()->TriggerRebuild();
+
 		GetRootLayer()->MarkForRedraw(invalid);
 		GetRootLayer()->TriggerRedraw();
 	}