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 42176376b..a743c929f 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Flow.Launcher.Plugin.WebSearch.csproj
@@ -50,6 +50,12 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.10.2.1">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs
index d6f7b3012..d08e14aaf 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Settings.cs
@@ -213,8 +213,8 @@ namespace Flow.Launcher.Plugin.WebSearch
             {
                 if (maxSuggestions != value)
                 {
-                    maxSuggestions = Math.Max(1, Math.Min(value, 10));
-                    OnPropertyChanged(nameof(MaxSuggestions));
+                    maxSuggestions = value;
+                    OnPropertyChanged();
                 }
             }
         }
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index d046f101b..963652b13 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -3,7 +3,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     xmlns:vm="clr-namespace:Flow.Launcher.Plugin.WebSearch"
     d:DataContext="{d:DesignInstance vm:SettingsViewModel}"
     d:DesignHeight="300"
@@ -45,17 +47,17 @@
             x:Name="SearchSourcesListView"
             Grid.Row="0"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
+            AllowDrop="True"
             BorderBrush="DarkGray"
             BorderThickness="1"
+            Drop="ListView_Drop"
             GridViewColumnHeader.Click="SortByColumn"
             ItemsSource="{Binding Settings.SearchSources}"
             MouseDoubleClick="MouseDoubleClickItem"
-            SelectedItem="{Binding Settings.SelectedSearchSource}"
-            SizeChanged="ListView_SizeChanged"
             PreviewMouseLeftButtonDown="ListView_PreviewMouseLeftButtonDown"
             PreviewMouseMove="ListView_PreviewMouseMove"
-            AllowDrop="True"
-            Drop="ListView_Drop"
+            SelectedItem="{Binding Settings.SelectedSearchSource}"
+            SizeChanged="ListView_SizeChanged"
             Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
             <ListView.View>
                 <GridView>
@@ -146,45 +148,48 @@
 
         <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeparatorStyle}" />
 
-        <DockPanel
+        <StackPanel
             Grid.Row="3"
-            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
-            HorizontalAlignment="Right">
-            <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
-                <Label
+            HorizontalAlignment="Right"
+            Orientation="Vertical">
+            <StackPanel Orientation="Horizontal">
+                <TextBlock
+                    Margin="{StaticResource SettingPanelItemTopBottomMargin}"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_max_suggestions}" />
-                <TextBox
-                    Width="40"
-                    Height="30"
-                    Margin="{StaticResource SettingPanelItemLeftMargin}"
-                    VerticalAlignment="Center"
-                    HorizontalAlignment="Center"
-                    TextAlignment="Center"
-                    FontSize="11"
-                    Text="{Binding Settings.MaxSuggestions, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
+                    Text="{DynamicResource flowlauncher_plugin_websearch_max_suggestions}" />
+                <ui:NumberBox
+                    Width="120"
+                    MinWidth="120"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                    Maximum="1000"
+                    Minimum="1"
+                    SmallChange="10"
+                    SpinButtonPlacementMode="Compact"
+                    ValidationMode="InvalidInputOverwritten"
+                    Value="{Binding Settings.MaxSuggestions, Mode=TwoWay}" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <TextBlock
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
-                    Margin="{StaticResource SettingPanelItemLeftMargin}"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" />
+                    Text="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion_provider}" />
                 <ComboBox
                     Height="30"
-                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                     VerticalAlignment="Center"
-                    FontSize="11"
                     IsEnabled="{Binding Settings.EnableSuggestion}"
                     ItemsSource="{Binding Settings.Suggestions}"
                     SelectedItem="{Binding Settings.SelectedSuggestion}" />
                 <CheckBox
                     Name="EnableSuggestion"
-                    Margin="{StaticResource SettingPanelItemLeftMargin}"
+                    Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Content="{DynamicResource flowlauncher_plugin_websearch_enable_suggestion}"
                     IsChecked="{Binding Settings.EnableSuggestion}" />
             </StackPanel>
-        </DockPanel>
+        </StackPanel>
     </Grid>
 </UserControl>
\ No newline at end of file