diff --git a/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml
new file mode 100644
index 0000000..4521bb4
--- /dev/null
+++ b/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml
@@ -0,0 +1,130 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:vm="using:ClaudeDo.Ui.ViewModels.Modals"
+        xmlns:converters="using:ClaudeDo.Ui.Converters"
+        x:Class="ClaudeDo.Ui.Views.Modals.WorktreesOverviewModalView"
+        x:DataType="vm:WorktreesOverviewModalViewModel"
+        Title="{Binding Title}"
+        Width="900" Height="560" MinWidth="640" MinHeight="360"
+        WindowStartupLocation="CenterOwner"
+        Background="{DynamicResource VoidBrush}">
+  <Window.Resources>
+    <converters:WorktreeStateColorConverter x:Key="WorktreeStateColor"/>
+    <DataTemplate x:Key="WorktreeRowTemplate" x:DataType="vm:WorktreeOverviewRowViewModel">
+      <Border Classes="wt-row">
+        <Border.ContextMenu>
+          <ContextMenu>
+            <MenuItem Header="Show diff"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).ShowDiffCommand}"
+                      CommandParameter="{Binding}"/>
+            <MenuItem Header="Open in Explorer"
+                      IsEnabled="{Binding PathExistsOnDisk}"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).OpenInExplorerCommand}"
+                      CommandParameter="{Binding}"/>
+            <MenuItem Header="Jump to task"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).JumpToTaskCommand}"
+                      CommandParameter="{Binding}"/>
+            <Separator/>
+            <MenuItem Header="Discard"
+                      IsEnabled="{Binding IsActive}"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).DiscardCommand}"
+                      CommandParameter="{Binding}"/>
+            <MenuItem Header="Keep"
+                      IsEnabled="{Binding IsActive}"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).KeepCommand}"
+                      CommandParameter="{Binding}"/>
+            <Separator/>
+            <MenuItem Header="Copy branch"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).CopyBranchCommand}"
+                      CommandParameter="{Binding}"/>
+            <MenuItem Header="Copy path"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).CopyPathCommand}"
+                      CommandParameter="{Binding}"/>
+            <Separator/>
+            <MenuItem Header="Force remove"
+                      Foreground="#EF5350"
+                      Command="{Binding $parent[Window].((vm:WorktreesOverviewModalViewModel)DataContext).ForceRemoveCommand}"
+                      CommandParameter="{Binding}"/>
+          </ContextMenu>
+        </Border.ContextMenu>
+        <Grid ColumnDefinitions="*,200,90,80,80">
+          <StackPanel Grid.Column="0" Orientation="Vertical" Spacing="2">
+            <TextBlock Text="{Binding TaskTitle}" FontWeight="SemiBold"/>
+            <StackPanel Orientation="Horizontal" Spacing="4">
+              <TextBlock Text="{Binding TaskStatus}" FontSize="10"
+                         Foreground="{DynamicResource TextFaintBrush}"/>
+              <TextBlock Text="•" FontSize="10" Foreground="{DynamicResource TextFaintBrush}"
+                         IsVisible="{Binding !PathExistsOnDisk}"/>
+              <TextBlock Text="phantom" FontSize="10" Foreground="#EF5350"
+                         IsVisible="{Binding !PathExistsOnDisk}"
+                         ToolTip.Tip="Directory missing on disk"/>
+            </StackPanel>
+          </StackPanel>
+          <TextBlock Grid.Column="1" Text="{Binding BranchName}"
+                     FontFamily="{DynamicResource MonoFont}" FontSize="11"
+                     VerticalAlignment="Center" TextTrimming="CharacterEllipsis"/>
+          <Border Grid.Column="2" CornerRadius="3" Padding="6,2" VerticalAlignment="Center"
+                  Background="{Binding State, Converter={StaticResource WorktreeStateColor}}">
+            <TextBlock Text="{Binding State}" FontSize="10" Foreground="White"
+                       HorizontalAlignment="Center"/>
+          </Border>
+          <TextBlock Grid.Column="3" Text="{Binding DiffStat}" VerticalAlignment="Center"
+                     FontFamily="{DynamicResource MonoFont}" FontSize="11"
+                     Foreground="{DynamicResource TextDimBrush}"/>
+          <TextBlock Grid.Column="4" Text="{Binding AgeText}" VerticalAlignment="Center"
+                     FontSize="11" Foreground="{DynamicResource TextDimBrush}"/>
+        </Grid>
+      </Border>
+    </DataTemplate>
+  </Window.Resources>
+
+  <Window.Styles>
+    <Style Selector="Border.wt-row">
+      <Setter Property="Background" Value="{DynamicResource DeepBrush}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource LineBrush}"/>
+      <Setter Property="BorderThickness" Value="0,0,0,1"/>
+      <Setter Property="Padding" Value="10,8"/>
+    </Style>
+  </Window.Styles>
+
+  <DockPanel LastChildFill="True" Margin="12">
+    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Spacing="8" Margin="0,0,0,8">
+      <Button Content="Refresh" Command="{Binding RefreshCommand}" IsEnabled="{Binding !IsBusy}"/>
+      <Button Content="Cleanup finished" Command="{Binding CleanupFinishedCommand}" IsEnabled="{Binding !IsBusy}"/>
+      <TextBlock Text="{Binding StatusMessage}" VerticalAlignment="Center" Margin="12,0,0,0"
+                 Foreground="{DynamicResource TextDimBrush}"/>
+    </StackPanel>
+
+    <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,8,0,0">
+      <Button Content="Close" Command="{Binding CloseCommand}"/>
+    </StackPanel>
+
+    <ScrollViewer>
+      <Grid>
+        <ItemsControl ItemsSource="{Binding Rows}" IsVisible="{Binding !IsGlobal}">
+          <ItemsControl.ItemTemplate>
+            <DataTemplate DataType="vm:WorktreeOverviewRowViewModel">
+              <ContentControl ContentTemplate="{StaticResource WorktreeRowTemplate}" Content="{Binding}"/>
+            </DataTemplate>
+          </ItemsControl.ItemTemplate>
+        </ItemsControl>
+
+        <ItemsControl ItemsSource="{Binding Groups}" IsVisible="{Binding IsGlobal}">
+          <ItemsControl.ItemTemplate>
+            <DataTemplate DataType="vm:WorktreesGroupViewModel">
+              <Expander Header="{Binding ListName}" IsExpanded="True" Margin="0,0,0,6">
+                <ItemsControl ItemsSource="{Binding Rows}">
+                  <ItemsControl.ItemTemplate>
+                    <DataTemplate DataType="vm:WorktreeOverviewRowViewModel">
+                      <ContentControl ContentTemplate="{StaticResource WorktreeRowTemplate}" Content="{Binding}"/>
+                    </DataTemplate>
+                  </ItemsControl.ItemTemplate>
+                </ItemsControl>
+              </Expander>
+            </DataTemplate>
+          </ItemsControl.ItemTemplate>
+        </ItemsControl>
+      </Grid>
+    </ScrollViewer>
+  </DockPanel>
+</Window>
diff --git a/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml.cs b/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml.cs
new file mode 100644
index 0000000..500cf78
--- /dev/null
+++ b/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml.cs
@@ -0,0 +1,8 @@
+using Avalonia.Controls;
+
+namespace ClaudeDo.Ui.Views.Modals;
+
+public partial class WorktreesOverviewModalView : Window
+{
+    public WorktreesOverviewModalView() => InitializeComponent();
+}