diff --git a/apps/ai-game-creator-shell/src/features/ui-editor/stageStatusOverview.ts b/apps/ai-game-creator-shell/src/features/ui-editor/stageStatusOverview.ts
index eb4b99f61..cdfb2be40 100644
--- a/apps/ai-game-creator-shell/src/features/ui-editor/stageStatusOverview.ts
+++ b/apps/ai-game-creator-shell/src/features/ui-editor/stageStatusOverview.ts
@@ -88,15 +88,15 @@ export function getNextUiTreeNodeTarget(
   previous: string | UiTreeNodeCursor | null,
 ): UiTreeNodeTarget | null {
   if (targets.length === 0) return null;
-  const previousIndex =
-    typeof previous === 'string'
-      ? targets.findIndex(({ node }) => node.id === previous)
-      : previous
-        ? targets.findIndex(
-            ({ treeId, node }) =>
-              treeId === previous.treeId && node.id === previous.nodeId,
-          )
-        : -1;
+  let previousIndex = -1;
+  if (typeof previous === 'string') {
+    previousIndex = targets.findIndex(({ node }) => node.id === previous);
+  } else if (previous) {
+    previousIndex = targets.findIndex(
+      ({ treeId, node }) =>
+        treeId === previous.treeId && node.id === previous.nodeId,
+    );
+  }
   return targets[(previousIndex + 1) % targets.length] ?? null;
 }