diff --git a/src/apps/workspaces/Workspaces.cpp b/src/apps/workspaces/Workspaces.cpp
index 5f0a5f9693..df2d6af154 100644
--- a/src/apps/workspaces/Workspaces.cpp
+++ b/src/apps/workspaces/Workspaces.cpp
@@ -554,8 +554,10 @@ WorkspacesWindow::MessageReceived(BMessage *message)
 
 			if (enable)
 				SetLook(B_TITLED_WINDOW_LOOK);
-			else
+			else {
 				SetLook(B_NO_BORDER_WINDOW_LOOK);
+				fSettings->SetHasTitle(true);
+			}
 
 			fSettings->SetHasBorder(enable);
 			break;
@@ -569,8 +571,10 @@ WorkspacesWindow::MessageReceived(BMessage *message)
 
 			if (enable)
 				SetLook(B_TITLED_WINDOW_LOOK);
-			else
+			else {
 				SetLook(B_MODAL_WINDOW_LOOK);
+				fSettings->SetHasBorder(true);
+			}
 
 			fSettings->SetHasTitle(enable);
 			break;