diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 96449c7bb..6054b5c54 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -10,7 +10,7 @@
     mc:Ignorable="d">
     <Grid Margin="0">
         <Grid.RowDefinitions>
-            <RowDefinition Height="225" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="60" />
         </Grid.RowDefinitions>
@@ -18,61 +18,45 @@
             Grid.Row="0"
             HorizontalAlignment="Stretch"
             Orientation="Vertical">
-            <StackPanel Width="Auto" Orientation="Vertical">
-                <StackPanel Width="Auto" Orientation="Horizontal">
-                    <CheckBox
-                        Name="HideLnkEnabled"
-                        Width="220"
-                        Margin="70,8,10,8"
-                        Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
-                        IsChecked="{Binding HideAppsPath}"
-                        ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
-                    <CheckBox
-                        Name="DescriptionEnabled"
-                        Margin="70,8,10,8"
-                        Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
-                        IsChecked="{Binding EnableDescription}"
-                        ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
-                </StackPanel>
-                <Separator
-                    Height="1"
-                    BorderBrush="{DynamicResource Color03B}"
-                    BorderThickness="1" />
+            <WrapPanel Width="Auto" Margin="70,8,10,0">
+                <CheckBox
+                    Name="HideLnkEnabled"
+                    Margin="0,0,30,8"
+                    Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
+                    IsChecked="{Binding HideAppsPath}"
+                    ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
+                <CheckBox
+                    Name="DescriptionEnabled"
+                    Margin="0,0,30,8"
+                    Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
+                    IsChecked="{Binding EnableDescription}"
+                    ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
 
-                <StackPanel Width="Auto" Orientation="Horizontal">
-                    <CheckBox
-                        Name="StartMenuEnabled"
-                        Width="220"
-                        Margin="70,8,10,8"
-                        Content="{DynamicResource flowlauncher_plugin_program_index_start}"
-                        IsChecked="{Binding EnableStartMenuSource}"
-                        ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
-                    <CheckBox
-                        Name="RegistryEnabled"
-                        Margin="70,8,10,8"
-                        Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
-                        IsChecked="{Binding EnableRegistrySource}"
-                        ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
-                </StackPanel>
-                <Separator
-                    Height="1"
-                    BorderBrush="{DynamicResource Color03B}"
-                    BorderThickness="1" />
+                <CheckBox
+                    Name="StartMenuEnabled"
+                    Margin="0,0,30,8"
+                    Content="{DynamicResource flowlauncher_plugin_program_index_start}"
+                    IsChecked="{Binding EnableStartMenuSource}"
+                    ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
+                <CheckBox
+                    Name="RegistryEnabled"
+                    Margin="0,0,30,8"
+                    Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
+                    IsChecked="{Binding EnableRegistrySource}"
+                    ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
 
-                <StackPanel Width="Auto" Orientation="Horizontal">
-                    <CheckBox
-                        Name="PATHEnabled"
-                        Width="220"
-                        Margin="70,8,10,8"
-                        Content="{DynamicResource flowlauncher_plugin_program_index_PATH}"
-                        IsChecked="{Binding EnablePATHSource}"
-                        ToolTip="{DynamicResource flowlauncher_plugin_program_index_PATH_tooltip}" />
-                </StackPanel>
-                <Separator
-                    Height="1"
-                    BorderBrush="{DynamicResource Color03B}"
-                    BorderThickness="1" />
-            </StackPanel>
+                <CheckBox
+                    Name="PATHEnabled"
+                    Margin="0,0,30,8"
+                    Content="{DynamicResource flowlauncher_plugin_program_index_PATH}"
+                    IsChecked="{Binding EnablePATHSource}"
+                    ToolTip="{DynamicResource flowlauncher_plugin_program_index_PATH_tooltip}" />
+
+            </WrapPanel>
+            <Separator
+                Height="1"
+                BorderBrush="{DynamicResource Color03B}"
+                BorderThickness="1" />
             <StackPanel
                 Width="Auto"
                 Margin="10,6,0,0"