diff --git a/src/servers/app/DesktopSettings.cpp b/src/servers/app/DesktopSettings.cpp
index 5dd210589c..3075a3325f 100644
--- a/src/servers/app/DesktopSettings.cpp
+++ b/src/servers/app/DesktopSettings.cpp
@@ -110,7 +110,7 @@ DesktopSettings::Private::_Load()
 			}
 
 			int32 i = 0;
-			while (i < 32
+			while (i < kMaxWorkspaces
 				&& settings.FindMessage("workspace", i, &fWorkspaceMessages[i]) == B_OK) {
 				i++;
 			}