diff --git a/Applications/Workspace/Workspace_main.m b/Applications/Workspace/Workspace_main.m
index c0fd47b34..276ab8a61 100644
--- a/Applications/Workspace/Workspace_main.m
+++ b/Applications/Workspace/Workspace_main.m
@@ -142,7 +142,8 @@ int main(int argc, const char **argv)
   fprintf(stderr, "=== Starting Workspace ===\n");
   defs = [[OSEDefaults alloc] initDefaultsWithPath:NSUserDomainMask domain:@"Workspace"];
   workspace_q = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0);
-  if ([defs boolForKey:@"RestoreDisplayLayout"] != NO) {
+  if ([defs objectForKey:@"RestoreDisplayLayout"] == nil ||
+      [defs boolForKey:@"RestoreDisplayLayout"] == YES) {
     dispatch_sync(workspace_q, ^{
       // Restore display layout
       OSEScreen *screen = [OSEScreen sharedScreen];
diff --git a/OS/Linux/etc/skel/Library/Preferences/.NextSpace/Workspace b/OS/Linux/etc/skel/Library/Preferences/.NextSpace/Workspace
index 3ae5051fc..7dcdfe1c5 100644
--- a/OS/Linux/etc/skel/Library/Preferences/.NextSpace/Workspace
+++ b/OS/Linux/etc/skel/Library/Preferences/.NextSpace/Workspace
@@ -1,6 +1,7 @@
 {
     BrowserViewerColumnWidth = <*R150>;
     OpenConsoleAtStart = NO;
+    RestoreDisplayLayout = YES;
     RootShelfContents = {
     };
     RootViewerShelfSize = <*R76>;