src/main.c Modified

@@ -146,7 +146,6 @@
     wl_list_init(&wimp.mouse_bindings);
     wl_list_init(&wimp.marks);
     add_desk();
-    wimp.current_desk = wl_container_of(wimp.desks.next, wimp.current_desk, link);
 
     // configure
     locate_config();

src/desk.c Modified

@@ -17,6 +17,10 @@
     desk->zoom = 1;
     desk->fullscreened = NULL;
     wimp.desk_count++;
+
+    if (!wimp.current_desk) {
+	wimp.current_desk = wl_container_of(wimp.desks.next, wimp.current_desk, link);
+    }
 }