Fix first-click switch to main worktree

Cooper Jones · Cooper Jones · commit 62cf76724e27 · 2026-04-01T19:27:18.000-04:00
diff --git a/app/src/ui/toolbar/worktree-dropdown.tsx b/app/src/ui/toolbar/worktree-dropdown.tsx
@@ -58,6 +58,10 @@ export class WorktreeDropdown extends React.Component<
     const { allWorktrees } = this.props.repositoryState.worktreesState
     const mainWorktree = allWorktrees.find(wt => wt.type === 'main')
 
+    if (mainWorktree) {
+      setPreferredWorktreePath(mainWorktree.path, worktree.path)
+    }
+
     const existingRepo = repositories.find(
       r => r instanceof Repository && normalizePath(r.path) === worktreePath
     )
@@ -77,10 +81,6 @@ export class WorktreeDropdown extends React.Component<
       }
     }
 
-    if (mainWorktree) {
-      setPreferredWorktreePath(mainWorktree.path, worktree.path)
-    }
-
     if (previousWorktreeRepo) {
       await dispatcher.removeRepository(previousWorktreeRepo, false)
       dispatcher.closeFoldout(FoldoutType.Repository)

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@ export class WorktreeDropdown extends React.Component<`
`58`	`58`	`const { allWorktrees } = this.props.repositoryState.worktreesState`
`59`	`59`	`const mainWorktree = allWorktrees.find(wt => wt.type === 'main')`
`60`	`60`
	`61`	`+ if (mainWorktree) {`
	`62`	`+ setPreferredWorktreePath(mainWorktree.path, worktree.path)`
	`63`	`+ }`
	`64`	`+`
`61`	`65`	`const existingRepo = repositories.find(`
`62`	`66`	`r => r instanceof Repository && normalizePath(r.path) === worktreePath`
`63`	`67`	`)`
`@@ -77,10 +81,6 @@ export class WorktreeDropdown extends React.Component<`
`77`	`81`	`}`
`78`	`82`	`}`
`79`	`83`
`80`		`- if (mainWorktree) {`
`81`		`- setPreferredWorktreePath(mainWorktree.path, worktree.path)`
`82`		`- }`
`83`		`-`
`84`	`84`	`if (previousWorktreeRepo) {`
`85`	`85`	`await dispatcher.removeRepository(previousWorktreeRepo, false)`
`86`	`86`	`dispatcher.closeFoldout(FoldoutType.Repository)`