diff --git a/src/NileLibrarySettingsView.xaml b/src/NileLibrarySettingsView.xaml
index 4748987..a19caad 100644
--- a/src/NileLibrarySettingsView.xaml
+++ b/src/NileLibrarySettingsView.xaml
@@ -79,6 +79,18 @@
                 <CheckBox Grid.Column="0" Grid.Row="5"
                             Content="{DynamicResource LOCNileUnattendedInstall}" ToolTip="{DynamicResource LOCNileUnattendedInstallToolTip}"
                             IsChecked="{Binding Settings.UnattendedInstall}" Margin="0,0,0,10" />
+                <DockPanel Margin="0,0,0,5">
+                    <TextBlock Text="{DynamicResource LOCNileGamesInstallationPath}" Grid.Row="1" Grid.Column="0"
+                               Margin="0,0,7,0" VerticalAlignment="Center" HorizontalAlignment="Left">
+                    </TextBlock>
+                    <Button Margin="5 0 0 0" DockPanel.Dock="Right"
+                            Name="ChooseGamePathBtn" Click="ChooseGamePathBtn_Click" Content="&#xec5b;" 
+                            FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCNile3P_PlayniteSelectDirectoryTooltip}"
+                            VerticalAlignment="Center" />
+                    <TextBox Name="SelectedGamePathTxt"
+                        Text="{Binding Settings.GamesInstallationPath, UpdateSourceTrigger=PropertyChanged}"
+                        VerticalAlignment="Center" />
+                </DockPanel>
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition x:Name="Left" Width="Auto" />
@@ -103,35 +115,16 @@
         <TabItem Header="{DynamicResource LOCNile3P_PlayniteSettingsAdvancedLabel}">
             <ScrollViewer>
                 <StackPanel Margin="20">
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition></RowDefinition>
-                            <RowDefinition></RowDefinition>
-                        </Grid.RowDefinitions>
-                        <TextBlock Text="{DynamicResource LOCNileLauncherCustomPath}" Grid.Column="0" Grid.Row="0"
-                               Margin="0,0,0,5" VerticalAlignment="Center" HorizontalAlignment="Left">
+                    <DockPanel>
+                        <TextBlock Text="{DynamicResource LOCNileLauncherCustomPath}"
+                               Margin="0,0,7,0" VerticalAlignment="Center" HorizontalAlignment="Left">
                         </TextBlock>
-                        <TextBox Text="{Binding Settings.SelectedNilePath, UpdateSourceTrigger=PropertyChanged}" x:Name="SelectedNilePathTxt" 
-                             Grid.Row="0" Grid.Column="1" Margin="10,0,0,5" VerticalAlignment="Center"/>
-                        <Button Name="ChooseLauncherBtn"
-                            Margin="5,0,0,5" Content="&#xec5b;" FontFamily="{DynamicResource FontIcoFont}" Click="ChooseLauncherBtn_Click" Grid.Row="0" Grid.Column="2"
+                        <Button Name="ChooseLauncherBtn" DockPanel.Dock="Right"
+                            Margin="5,0,0,0" Content="&#xec5b;" FontFamily="{DynamicResource FontIcoFont}" Click="ChooseLauncherBtn_Click"
                             ToolTip="{DynamicResource LOCNile3P_PlayniteSelectFileTooltip}" VerticalAlignment="Center"/>
-                        <TextBlock Text="{DynamicResource LOCNileGamesInstallationPath}" Grid.Row="1" Grid.Column="0"
-                               Margin="0,0,0,5" VerticalAlignment="Center" HorizontalAlignment="Left">
-                        </TextBlock>
-                        <TextBox Name="SelectedGamePathTxt"
-                        Text="{Binding Settings.GamesInstallationPath, UpdateSourceTrigger=PropertyChanged}"
-                        VerticalAlignment="Center" Grid.Row="1" Grid.Column="1" Margin="10,0,0,5"/>
-                        <Button Margin="5 0 0 5"
-                            Name="ChooseGamePathBtn" Click="ChooseGamePathBtn_Click" Content="&#xec5b;" 
-                            FontFamily="{DynamicResource FontIcoFont}" ToolTip="{DynamicResource LOCNile3P_PlayniteSelectDirectoryTooltip}"
-                            Grid.Row="1" Grid.Column="2" VerticalAlignment="Center"/>
-                    </Grid>
+                        <TextBox Text="{Binding Settings.SelectedNilePath, UpdateSourceTrigger=PropertyChanged}" x:Name="SelectedNilePathTxt" 
+                            VerticalAlignment="Center"/>
+                    </DockPanel>
                     <StackPanel Margin="0,10,0,0">
                         <TextBlock Text="{DynamicResource LOCNileCache}" FontSize="18"
                         Margin="0,0,0,2" />