diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 998af39f..c3a69295 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -678,6 +678,9 @@ impl Workspaces {
             if set.workspaces.is_empty() {
                 set.add_empty_workspace(workspace_state);
             }
+            for (i, workspace) in set.workspaces.iter_mut().enumerate() {
+                workspace_set_idx(workspace_state, i as u8 + 1, set.idx, &workspace.handle);
+            }
             set.active = set
                 .workspaces
                 .iter()