diff --git a/src/renderer/src/components/status-bar/codex-restart-status-summary.ts b/src/renderer/src/components/status-bar/codex-restart-status-summary.ts
index f61f6430236..ac7273b34af 100644
--- a/src/renderer/src/components/status-bar/codex-restart-status-summary.ts
+++ b/src/renderer/src/components/status-bar/codex-restart-status-summary.ts
@@ -1,3 +1,8 @@
+import {
+  selectWorktreesByRepo,
+  selectFolderWorkspaces,
+  selectDetectedWorktreesByRepo
+} from '@/store/workspaces/catalog/workspace-record-fields'
 import {
   eligibleCodexRestartPtyIds,
   codexRestartTabIndex,
@@ -56,9 +61,9 @@ export function selectCodexRestartStatus(
     previous.tabsByWorktree !== state.tabsByWorktree ||
     previous.terminalLayoutsByTabId !== state.terminalLayoutsByTabId ||
     previous.repos !== state.repos ||
-    previous.worktreesByRepo !== state.worktreesByRepo ||
-    previous.detectedWorktreesByRepo !== state.detectedWorktreesByRepo ||
-    previous.folderWorkspaces !== state.folderWorkspaces ||
+    selectWorktreesByRepo(previous) !== selectWorktreesByRepo(state) ||
+    selectDetectedWorktreesByRepo(previous) !== selectDetectedWorktreesByRepo(state) ||
+    selectFolderWorkspaces(previous) !== selectFolderWorkspaces(state) ||
     previous.projectGroups !== state.projectGroups ||
     previous.restoredRuntimeHostIdByWorkspaceSessionKey !==
       state.restoredRuntimeHostIdByWorkspaceSessionKey ||
@@ -70,9 +75,9 @@ export function selectCodexRestartStatus(
   ) {
     previous = {
       repos: state.repos,
-      worktreesByRepo: state.worktreesByRepo,
-      detectedWorktreesByRepo: state.detectedWorktreesByRepo,
-      folderWorkspaces: state.folderWorkspaces,
+      worktreesByRepo: selectWorktreesByRepo(state),
+      detectedWorktreesByRepo: selectDetectedWorktreesByRepo(state),
+      folderWorkspaces: selectFolderWorkspaces(state),
       projectGroups: state.projectGroups,
       restoredRuntimeHostIdByWorkspaceSessionKey: state.restoredRuntimeHostIdByWorkspaceSessionKey,
       activeWorktreeId: state.activeWorktreeId,