diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
index a743c929f..edf6fe9d6 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
@@ -51,6 +51,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!-- Do not include it in the build files -->
     <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs
index d08e14aaf..31540ad92 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs
@@ -211,10 +211,13 @@ namespace Flow.Launcher.Plugin.WebSearch
             get => maxSuggestions;
             set
             {
-                if (maxSuggestions != value)
+                if (value > 0 && value <= 1000)
                 {
-                    maxSuggestions = value;
-                    OnPropertyChanged();
+                    if (maxSuggestions != value)
+                    {
+                        maxSuggestions = value;
+                        OnPropertyChanged();
+                    }
                 }
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 963652b13..06afd72f5 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -167,7 +167,8 @@
                     SmallChange="10"
                     SpinButtonPlacementMode="Compact"
                     ValidationMode="InvalidInputOverwritten"
-                    Value="{Binding Settings.MaxSuggestions, Mode=TwoWay}" />
+                    ValueChanged="NumberBox_ValueChanged"
+                    Value="{Binding Settings.MaxSuggestions, Mode=OneWay}" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <TextBlock
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs
index 6dc766fff..1c1dd3116 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs
@@ -240,5 +240,15 @@ namespace Flow.Launcher.Plugin.WebSearch
             }
             return null;
         }
+
+        // This is used for NumberBox to force its value to be 1 when the user clears the value
+        private void NumberBox_ValueChanged(iNKORE.UI.WPF.Modern.Controls.NumberBox sender, iNKORE.UI.WPF.Modern.Controls.NumberBoxValueChangedEventArgs args)
+        {
+            if (double.IsNaN(args.NewValue))
+            {
+                sender.Value = 1;
+                _settings.MaxSuggestions = (int)sender.Value;
+            }
+        }
     }
 }