diff --git a/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml
index 5d90bb2..94f0b93 100644
--- a/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/WorktreesOverviewModalView.axaml
@@ -10,7 +10,7 @@
         CanResize="True"
         WindowStartupLocation="CenterOwner"
         Background="{DynamicResource SurfaceBrush}"
-        WindowDecorations="None"
+        WindowDecorations="BorderOnly"
         ExtendClientAreaToDecorationsHint="True">
 
   <Window.Resources>
@@ -166,7 +166,8 @@
           <ItemsControl ItemsSource="{Binding Groups}" IsVisible="{Binding IsGlobal}">
             <ItemsControl.ItemTemplate>
               <DataTemplate DataType="vm:WorktreesGroupViewModel">
-                <Expander Header="{Binding ListName}" IsExpanded="True" Margin="0,0,0,6">
+                <Expander Header="{Binding ListName}" IsExpanded="True" Margin="0,0,0,6"
+                          HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
                   <ItemsControl ItemsSource="{Binding Rows}">
                     <ItemsControl.ItemTemplate>
                       <DataTemplate DataType="vm:WorktreeOverviewRowViewModel">