diff --git a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
index 2f03eac..6671456 100644
--- a/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
+++ b/src/Semi.Avalonia/Controls/ManagedFileChooser.axaml
@@ -23,6 +23,7 @@
             <ControlTemplate TargetType="dialogs:ManagedFileChooser">
                 <DockPanel>
                     <Border
+                        Margin="8"
                         Padding="4"
                         DockPanel.Dock="Left"
                         Theme="{DynamicResource CardBorder}">
@@ -47,7 +48,7 @@
                     </Border>
                     <DockPanel
                         x:Name="NavBar"
-                        Margin="8,5,8,0"
+                        Margin="8,8,8,0"
                         VerticalAlignment="Center"
                         DockPanel.Dock="Top">
                         <Button
@@ -89,28 +90,32 @@
                             HorizontalAlignment="Right"
                             Rows="1">
                             <Button
-                                Margin="8,0"
+                                Margin="8,0,0,0"
                                 Classes="Primary"
                                 Command="{Binding Ok}">
                                 OK
                             </Button>
                             <Button
-                                Margin="8,0"
+                                Margin="8,0,0,0"
                                 Classes="Danger"
                                 Command="{Binding Cancel}">
                                 Cancel
                             </Button>
                         </UniformGrid>
                     </DockPanel>
-                    <Border Padding="8" Theme="{DynamicResource CardBorder}">
+                    <Border
+                        Margin="8"
+                        Padding="8"
+                        Theme="{DynamicResource CardBorder}">
                         <DockPanel Grid.IsSharedSizeScope="True">
                             <Grid
-                                Margin="0,0,0,8"
                                 HorizontalAlignment="Stretch"
                                 ClipToBounds="True"
                                 DockPanel.Dock="Top">
                                 <Grid.Styles>
                                     <Style Selector="TextBlock">
+                                        <Setter Property="Height" Value="24" />
+                                        <Setter Property="VerticalAlignment" Value="Center" />
                                         <Setter Property="Margin" Value="8 0 0 0 " />
                                     </Style>
                                 </Grid.Styles>