diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 7380baa6a..a7cff9049 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -123,7 +123,7 @@
                         Orientation="Horizontal">
                         <Grid Width="545">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="180" />
+                                <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
@@ -135,7 +135,7 @@
                             <TextBlock
                                 Grid.Row="0"
                                 Grid.Column="0"
-                                Margin="14,5,0,0"
+                                Margin="14,5,20,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -153,23 +153,14 @@
                             <TextBlock
                                 Grid.Row="1"
                                 Grid.Column="0"
-                                Margin="14,10,0,0"
+                                Margin="14,10,20,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Text="{DynamicResource fileManager_path}" />
                             <DockPanel Grid.Row="1" Grid.Column="1">
-                                <TextBox
-                                    x:Name="PathTextBox"
-                                    Width="250"
-                                    Margin="10,10,10,0"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Center"
-                                    IsEnabled="{Binding Editable}"
-                                    Text="{Binding Path}" />
                                 <Button
                                     Name="btnBrowseFile"
-                                    Width="80"
                                     Margin="0,10,15,0"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Center"
@@ -186,11 +177,18 @@
                                         </Style>
                                     </Button.Style>
                                 </Button>
+                                <TextBox
+                                    x:Name="PathTextBox"
+                                    Margin="10,10,10,0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    IsEnabled="{Binding Editable}"
+                                    Text="{Binding Path}" />
                             </DockPanel>
                             <TextBlock
                                 Grid.Row="2"
                                 Grid.Column="0"
-                                Margin="14,10,0,0"
+                                Margin="14,10,20,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -209,7 +207,7 @@
                             <TextBlock
                                 Grid.Row="3"
                                 Grid.Column="0"
-                                Margin="14,10,0,20"
+                                Margin="14,10,20,20"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"