diff --git a/src/ClaudeDo.Ui/ViewModels/Modals/WorktreeModalViewModel.cs b/src/ClaudeDo.Ui/ViewModels/Modals/WorktreeModalViewModel.cs index 3d880ad..de38b6d 100644 --- a/src/ClaudeDo.Ui/ViewModels/Modals/WorktreeModalViewModel.cs +++ b/src/ClaudeDo.Ui/ViewModels/Modals/WorktreeModalViewModel.cs @@ -152,5 +152,18 @@ public sealed partial class WorktreeModalViewModel : ViewModelBase if (parent == null) Root.Add(leaf); else parent.Children.Add(leaf); } + + SelectedNode = FindFirstLeaf(Root); + } + + private static WorktreeNodeViewModel? FindFirstLeaf(IEnumerable nodes) + { + foreach (var n in nodes) + { + if (!n.IsDirectory) return n; + var nested = FindFirstLeaf(n.Children); + if (nested is not null) return nested; + } + return null; } }