diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 013b173914..a2bbdafd4f 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -889,14 +889,9 @@ Desktop::WorkspaceFrame(int32 index) const
 		frame = fVirtualScreen.Frame();
 	else if (index >= 0 && index < fSettings->WorkspacesCount()) {
 		BMessage screenData;
-		int32 width;
-		int32 height;
 		fSettings->WorkspacesMessage(index)->FindMessage("screen", &screenData);
-		if (screenData.FindInt32("width", &width) != B_OK
-			|| screenData.FindInt32("height", &height) != B_OK)
+		if (screenData.FindRect("frame", &frame) != B_OK)
 			frame = fVirtualScreen.Frame();
-		else
-			frame.Set(0.0, 0.0, width - 1, height - 1);
 	}
 	return frame;
 }
diff --git a/src/servers/app/WorkspacesView.cpp b/src/servers/app/WorkspacesView.cpp
index 43c82b6d39..c8495fc1a2 100644
--- a/src/servers/app/WorkspacesView.cpp
+++ b/src/servers/app/WorkspacesView.cpp
@@ -22,7 +22,8 @@
 
 WorkspacesView::WorkspacesView(BRect frame, BPoint scrollingOffset,
 		const char* name, int32 token, uint32 resizeMode, uint32 flags)
-	: View(frame, scrollingOffset, name, token, resizeMode, flags),
+	:
+	View(frame, scrollingOffset, name, token, resizeMode, flags),
 	fSelectedWindow(NULL),
 	fSelectedWorkspace(-1),
 	fHasMoved(false)