diff --git a/src/ClaudeDo.Ui/Views/Modals/RepoImportModalView.axaml b/src/ClaudeDo.Ui/Views/Modals/RepoImportModalView.axaml
index f28290b..b00d994 100644
--- a/src/ClaudeDo.Ui/Views/Modals/RepoImportModalView.axaml
+++ b/src/ClaudeDo.Ui/Views/Modals/RepoImportModalView.axaml
@@ -1,6 +1,7 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="using:ClaudeDo.Ui.ViewModels.Modals"
+        xmlns:ctl="using:ClaudeDo.Ui.Views.Controls"
         x:Class="ClaudeDo.Ui.Views.Modals.RepoImportModalView"
         x:DataType="vm:RepoImportModalViewModel"
         Title="Add repos as lists"
@@ -12,22 +13,21 @@
   <Window.KeyBindings>
     <KeyBinding Gesture="Escape" Command="{Binding CancelCommand}"/>
   </Window.KeyBindings>
-  <Border BorderBrush="{DynamicResource LineBrush}" BorderThickness="1">
-    <Grid RowDefinitions="36,Auto,*,52">
 
-      <!-- Header -->
-      <Border Grid.Row="0" Background="{DynamicResource DeepBrush}"
-              BorderBrush="{DynamicResource LineBrush}" BorderThickness="0,0,0,1">
-        <Grid ColumnDefinitions="*,Auto" Margin="14,0">
-          <TextBlock Text="ADD REPOS AS LISTS" FontFamily="{DynamicResource MonoFont}" FontSize="11"
-                     LetterSpacing="1.4" Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
-          <Button Grid.Column="1" Classes="icon-btn" Content="✕" FontSize="12"
-                  Command="{Binding CancelCommand}" VerticalAlignment="Center"/>
-        </Grid>
-      </Border>
+  <ctl:ModalShell Title="ADD REPOS AS LISTS" CloseCommand="{Binding CancelCommand}">
+    <ctl:ModalShell.Footer>
+      <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Right"
+                  VerticalAlignment="Center" Margin="16,0">
+        <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
+        <Button Content="{Binding CreateButtonText}" Command="{Binding CreateCommand}"
+                IsEnabled="{Binding CanCreate}" MinWidth="120" Classes="primary"/>
+      </StackPanel>
+    </ctl:ModalShell.Footer>
 
+    <!-- Body: toolbar + checklist -->
+    <DockPanel>
       <!-- Toolbar: search + folder actions -->
-      <StackPanel Grid.Row="1" Spacing="8" Margin="16,12,16,6">
+      <StackPanel DockPanel.Dock="Top" Spacing="8" Margin="16,12,16,6">
         <TextBox Text="{Binding SearchText, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                  PlaceholderText="Search repos…"/>
         <Grid ColumnDefinitions="Auto,*,Auto">
@@ -39,7 +39,7 @@
       </StackPanel>
 
       <!-- Repo checklist -->
-      <ScrollViewer Grid.Row="2" Padding="16,2,16,8">
+      <ScrollViewer Padding="16,2,16,8">
         <ItemsControl ItemsSource="{Binding Repos}">
           <ItemsControl.ItemTemplate>
             <DataTemplate DataType="vm:RepoImportItemViewModel">
@@ -50,15 +50,15 @@
                           IsEnabled="{Binding CanToggle}"
                           VerticalAlignment="Center"/>
                 <TextBlock Grid.Column="1" Text="{Binding Name}"
-                           Foreground="{DynamicResource TextBrush}" FontSize="12"
+                           Foreground="{DynamicResource TextBrush}" FontSize="{StaticResource FontSizeBody}"
                            VerticalAlignment="Center" Margin="4,0,0,0"/>
                 <TextBlock Grid.Column="2" Text="{Binding FullPath}"
                            Foreground="{DynamicResource TextFaintBrush}"
-                           FontFamily="{DynamicResource MonoFont}" FontSize="10"
+                           FontFamily="{DynamicResource MonoFont}" FontSize="{StaticResource FontSizeEyebrow}"
                            TextTrimming="CharacterEllipsis"
                            VerticalAlignment="Center" Margin="8,0,0,0"/>
                 <TextBlock Grid.Column="3" Text="(already added)"
-                           Foreground="{DynamicResource TextFaintBrush}" FontSize="10"
+                           Foreground="{DynamicResource TextFaintBrush}" FontSize="{StaticResource FontSizeEyebrow}"
                            VerticalAlignment="Center" Margin="8,0,0,0"
                            IsVisible="{Binding AlreadyAdded}"/>
               </Grid>
@@ -66,18 +66,7 @@
           </ItemsControl.ItemTemplate>
         </ItemsControl>
       </ScrollViewer>
+    </DockPanel>
 
-      <!-- Footer -->
-      <Border Grid.Row="3" Background="{DynamicResource DeepBrush}"
-              BorderBrush="{DynamicResource LineBrush}" BorderThickness="0,1,0,0">
-        <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Right"
-                    VerticalAlignment="Center" Margin="16,0">
-          <Button Content="Cancel" Command="{Binding CancelCommand}" MinWidth="90"/>
-          <Button Content="{Binding CreateButtonText}" Command="{Binding CreateCommand}"
-                  IsEnabled="{Binding CanCreate}" MinWidth="120" Classes="primary"/>
-        </StackPanel>
-      </Border>
-
-    </Grid>
-  </Border>
+  </ctl:ModalShell>
 </Window>