diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
index 222eb6b8..6520b19e 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
@@ -10,137 +10,150 @@
     d:DataContext="{d:DesignInstance Type=dialogs:SettingsViewModel}"
     Style="{DynamicResource MaterialDesignRoot}"
     mc:Ignorable="d">
-    <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-        <StackPanel>
-            <TextBlock
-                Margin="16,16,16,8"
-                FontSize="19"
-                FontWeight="Light"
-                Text="Settings" />
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
 
-            <!--  Auto-updates  -->
-            <DockPanel
-                Margin="16,8"
-                Background="Transparent"
-                LastChildFill="False"
-                ToolTip="Perform automatic updates on every launch">
-                <TextBlock
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Text="Auto-updates" />
-                <ToggleButton
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right"
-                    IsChecked="{Binding IsAutoUpdateEnabled}" />
-            </DockPanel>
+        <TextBlock
+            Grid.Row="0"
+            Margin="16,16,16,8"
+            FontSize="19"
+            FontWeight="Light"
+            Text="Settings" />
 
-            <!--  Dark mode  -->
-            <DockPanel
-                Margin="16,8"
-                Background="Transparent"
-                LastChildFill="False"
-                ToolTip="Use darker colors in the UI">
-                <TextBlock
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Text="Dark mode" />
-                <ToggleButton
-                    x:Name="DarkModeToggleButton"
-                    VerticalAlignment="Center"
-                    Checked="DarkModeToggleButton_Checked"
-                    DockPanel.Dock="Right"
-                    IsChecked="{Binding IsDarkModeEnabled}"
-                    Unchecked="DarkModeToggleButton_Unchecked" />
-            </DockPanel>
-
-            <!--  Persist token  -->
-            <DockPanel
-                Margin="16,8"
-                Background="Transparent"
-                LastChildFill="False"
-                ToolTip="Save last used token in a file so that it can be persisted between sessions">
-                <TextBlock
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Text="Save token" />
-                <ToggleButton
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right"
-                    IsChecked="{Binding IsTokenPersisted}" />
-            </DockPanel>
-
-            <!--  Reuse media  -->
-            <DockPanel
-                Margin="16,8"
-                Background="Transparent"
-                LastChildFill="False"
-                ToolTip="Reuse already existing media content to skip redundant downloads">
-                <TextBlock
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Text="Reuse downloaded media" />
-                <ToggleButton
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right"
-                    IsChecked="{Binding ShouldReuseMedia}" />
-            </DockPanel>
-
-            <!--  Date format  -->
-            <DockPanel
-                Margin="16,8"
-                Background="Transparent"
-                LastChildFill="False"
-                ToolTip="Format used when writing dates (uses .NET date formatting rules)">
-                <TextBlock
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Text="Date format" />
-                <TextBox
-                    Width="150"
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right"
-                    Text="{Binding DateFormat}" />
-            </DockPanel>
-
-            <!--  Parallel limit  -->
-            <DockPanel
-                Margin="16,8"
-                Background="Transparent"
-                LastChildFill="False"
-                ToolTip="How many channels can be exported at the same time">
-                <TextBlock
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Left"
-                    Text="Parallel limit"
-                    TextAlignment="Right" />
-                <StackPanel
-                    VerticalAlignment="Center"
-                    DockPanel.Dock="Right"
-                    Orientation="Horizontal">
+        <ScrollViewer
+            Grid.Row="1"
+            HorizontalScrollBarVisibility="Disabled"
+            VerticalScrollBarVisibility="Auto">
+            <StackPanel>
+                <!--  Auto-updates  -->
+                <DockPanel
+                    Margin="16,8"
+                    Background="Transparent"
+                    LastChildFill="False"
+                    ToolTip="Perform automatic updates on every launch">
                     <TextBlock
-                        Margin="10,0"
                         VerticalAlignment="Center"
-                        FontWeight="SemiBold"
-                        Text="{Binding ParallelLimit}" />
-                    <Slider
+                        DockPanel.Dock="Left"
+                        Text="Auto-updates" />
+                    <ToggleButton
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Right"
+                        IsChecked="{Binding IsAutoUpdateEnabled}" />
+                </DockPanel>
+
+                <!--  Dark mode  -->
+                <DockPanel
+                    Margin="16,8"
+                    Background="Transparent"
+                    LastChildFill="False"
+                    ToolTip="Use darker colors in the UI">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left"
+                        Text="Dark mode" />
+                    <ToggleButton
+                        x:Name="DarkModeToggleButton"
+                        VerticalAlignment="Center"
+                        Checked="DarkModeToggleButton_Checked"
+                        DockPanel.Dock="Right"
+                        IsChecked="{Binding IsDarkModeEnabled}"
+                        Unchecked="DarkModeToggleButton_Unchecked" />
+                </DockPanel>
+
+                <!--  Persist token  -->
+                <DockPanel
+                    Margin="16,8"
+                    Background="Transparent"
+                    LastChildFill="False"
+                    ToolTip="Save last used token in a file so that it can be persisted between sessions">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left"
+                        Text="Save token" />
+                    <ToggleButton
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Right"
+                        IsChecked="{Binding IsTokenPersisted}" />
+                </DockPanel>
+
+                <!--  Reuse media  -->
+                <DockPanel
+                    Margin="16,8"
+                    Background="Transparent"
+                    LastChildFill="False"
+                    ToolTip="Reuse already existing media content to skip redundant downloads">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left"
+                        Text="Reuse downloaded media" />
+                    <ToggleButton
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Right"
+                        IsChecked="{Binding ShouldReuseMedia}" />
+                </DockPanel>
+
+                <!--  Date format  -->
+                <DockPanel
+                    Margin="16,8"
+                    Background="Transparent"
+                    LastChildFill="False"
+                    ToolTip="Format used when writing dates (uses .NET date formatting rules)">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left"
+                        Text="Date format" />
+                    <TextBox
                         Width="150"
                         VerticalAlignment="Center"
-                        Maximum="10"
-                        Minimum="1"
-                        Style="{DynamicResource MaterialDesignThinSlider}"
-                        Value="{Binding ParallelLimit}" />
-                </StackPanel>
-            </DockPanel>
+                        DockPanel.Dock="Right"
+                        Text="{Binding DateFormat}" />
+                </DockPanel>
 
-            <!--  Save button  -->
-            <Button
-                Margin="16"
-                HorizontalAlignment="Stretch"
-                Command="{s:Action Close}"
-                Content="SAVE"
-                IsCancel="True"
-                IsDefault="True"
-                Style="{DynamicResource MaterialDesignOutlinedButton}" />
-        </StackPanel>
-    </ScrollViewer>
+                <!--  Parallel limit  -->
+                <DockPanel
+                    Margin="16,8"
+                    Background="Transparent"
+                    LastChildFill="False"
+                    ToolTip="How many channels can be exported at the same time">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Left"
+                        Text="Parallel limit"
+                        TextAlignment="Right" />
+                    <StackPanel
+                        VerticalAlignment="Center"
+                        DockPanel.Dock="Right"
+                        Orientation="Horizontal">
+                        <TextBlock
+                            Margin="10,0"
+                            VerticalAlignment="Center"
+                            FontWeight="SemiBold"
+                            Text="{Binding ParallelLimit}" />
+                        <Slider
+                            Width="150"
+                            VerticalAlignment="Center"
+                            Maximum="10"
+                            Minimum="1"
+                            Style="{DynamicResource MaterialDesignThinSlider}"
+                            Value="{Binding ParallelLimit}" />
+                    </StackPanel>
+                </DockPanel>
+            </StackPanel>
+        </ScrollViewer>
+
+        <!--  Save button  -->
+        <Button
+            Grid.Row="2"
+            Margin="16"
+            HorizontalAlignment="Stretch"
+            Command="{s:Action Close}"
+            Content="SAVE"
+            IsCancel="True"
+            IsDefault="True"
+            Style="{DynamicResource MaterialDesignOutlinedButton}" />
+    </Grid>
 </UserControl>
\ No newline at end of file