diff --git a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
index 6d1f86a1f..6b8d83d81 100644
--- a/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
+++ b/Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
@@ -165,6 +165,12 @@ public partial class SettingsPaneThemeViewModel : BaseModel
         set => Settings.DateFormat = value;
     }
 
+    public IEnumerable<int> MaxResultsRange => Enumerable.Range(2, 16);
+    public bool KeepMaxResults
+    {
+        get => Settings.KeepMaxResults;
+        set => Settings.KeepMaxResults = value;
+    }
     public string ClockText => DateTime.Now.ToString(TimeFormat, Culture);
 
     public string DateText => DateTime.Now.ToString(DateFormat, Culture);
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index e983e77db..c2b23a295 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -153,24 +153,6 @@
                 </cc:Card>
             </cc:CardGroup>
 
-            <cc:CardGroup Margin="0 30 0 0">
-                <cc:Card
-                    Title="{DynamicResource KeepMaxResults}"
-                    Icon="&#xe8fd;"
-                    Sub="{DynamicResource KeepMaxResultsToolTip}">
-                    <ui:ToggleSwitch IsOn="{Binding KeepMaxResults}" />
-                </cc:Card>
-                <cc:Card
-                    Title="{DynamicResource maxShowResults}"
-                    Sub="{DynamicResource maxShowResultsToolTip}"
-                    Visibility="{Binding KeepMaxResults, Converter={StaticResource BoolToVisibilityConverter}}">
-                    <ComboBox
-                        Width="100"
-                        ItemsSource="{Binding MaxResultsRange}"
-                        SelectedItem="{Binding Settings.MaxResultsToShow}" />
-                </cc:Card>
-            </cc:CardGroup>
-
             <cc:Card
                 Title="{DynamicResource defaultFileManager}"
                 Margin="0 30 0 0"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index f3fbac4b8..acefceb4c 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -511,11 +511,28 @@
                 Text="{DynamicResource browserMoreThemes}"
                 Uri="{Binding LinkThemeGallery}" />
 
+            <cc:CardGroup Margin="0 20 0 0">
+                <cc:Card
+                    Title="{DynamicResource KeepMaxResults}"
+                    Icon="&#xe8fd;"
+                    Sub="{DynamicResource KeepMaxResultsToolTip}">
+                    <ui:ToggleSwitch IsOn="{Binding KeepMaxResults}" />
+                </cc:Card>
+                <cc:Card
+                    Title="{DynamicResource maxShowResults}"
+                    Sub="{DynamicResource maxShowResultsToolTip}"
+                    Visibility="{Binding KeepMaxResults, Converter={StaticResource BoolToVisibilityConverter}}">
+                    <ComboBox
+                        Width="100"
+                        ItemsSource="{Binding MaxResultsRange}"
+                        SelectedItem="{Binding Settings.MaxResultsToShow}" />
+                </cc:Card>
+            </cc:CardGroup>
 
             <!--  Fonts and icons  -->
             <cc:Card
                 Title="{DynamicResource useGlyphUI}"
-                Margin="0 20 0 0"
+                Margin="0 6 0 0"
                 Icon="&#xf6b8;"
                 Sub="{DynamicResource useGlyphUIEffect}">
                 <ui:ToggleSwitch