diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 4ba55b1107c..2f7d28212dd 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:flowlauncher="clr-namespace:Flow.Launcher"
     Title="{DynamicResource customeQueryHotkeyTitle}"
-    Width="500"
+    Width="530"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     Icon="Images\app.png"
@@ -79,56 +79,74 @@
                 </StackPanel>
 
                 <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Width="60"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource hotkey}" />
-                    <flowlauncher:HotkeyControl
-                        x:Name="ctlHotkey"
-                        Grid.Column="1"
-                        Width="200"
-                        Height="34"
-                        Margin="10,0,10,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        HorizontalContentAlignment="Left" />
-                    <TextBlock
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource actionKeyword}" />
-                </StackPanel>
-
-                <StackPanel Margin="0,0,0,0" Orientation="Horizontal">
-                    <TextBlock
-                        Grid.Row="0"
-                        Grid.Column="0"
-                        Width="60"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource customQuery}" />
-                    <TextBox
-                        x:Name="tbAction"
-                        Width="250"
-                        Margin="10"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center" />
-                    <Button
-                        x:Name="btnTestActionKeyword"
-                        Height="30"
-                        Padding="10,5,10,5"
-                        Click="BtnTestActionKeyword_OnClick"
-                        Content="{DynamicResource preview}" />
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Width="Auto"
+                            MinWidth="110"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource hotkey}" />
+                        <StackPanel
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Orientation="Horizontal">
+                            <flowlauncher:HotkeyControl
+                                x:Name="ctlHotkey"
+                                Grid.Column="1"
+                                Width="200"
+                                Height="34"
+                                Margin="10,0,10,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                HorizontalContentAlignment="Left" />
+                            <TextBlock
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                FontSize="14"
+                                Text="{DynamicResource actionKeyword}" />
+                        </StackPanel>
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Width="Auto"
+                            MinWidth="110"
+                            Margin="10"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource customQuery}" />
+                        <StackPanel
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Orientation="Horizontal">
+                            <TextBox
+                                x:Name="tbAction"
+                                MinWidth="220"
+                                Margin="10"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center" />
+                            <Button
+                                x:Name="btnTestActionKeyword"
+                                Padding="10,5,10,5"
+                                Click="BtnTestActionKeyword_OnClick"
+                                Content="{DynamicResource preview}" />
+                        </StackPanel>
+                    </Grid>
                 </StackPanel>
             </StackPanel>
         </StackPanel>
@@ -151,7 +169,8 @@
                     Width="100"
                     Height="32"
                     Margin="5,0,10,0"
-                    Click="btnAdd_OnClick">
+                    Click="btnAdd_OnClick"
+                    Style="{StaticResource AccentButtonStyle}">
                     <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
                 </Button>
             </StackPanel>
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index e11cbd5cbb3..516471ba3b3 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -267,6 +267,7 @@
     <system:String x:Key="HotkeyCtrlShiftEnterDesc">Run as Admin</system:String>
     <system:String x:Key="HotkeyCtrlHDesc">Query History</system:String>
     <system:String x:Key="HotkeyESCDesc">Back to Result in Context Menu</system:String>
+    <system:String x:Key="HotkeyTabDesc">Autocomplete</system:String>
     <system:String x:Key="HotkeyRunDesc">Open / Run Selected Item</system:String>
     <system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
     <system:String x:Key="HotkeyF5Desc">Reload Plugin Data</system:String>
diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml
index 8fb27c470da..d50bf82db4c 100644
--- a/Flow.Launcher/PriorityChangeWindow.xaml
+++ b/Flow.Launcher/PriorityChangeWindow.xaml
@@ -90,7 +90,6 @@
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
                         CornerRadius="4"
-                        Minimum="0"
                         SmallChange="1"
                         SpinButtonPlacementMode="Inline" />
                 </StackPanel>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
index b424af3d8eb..e7920d34ef0 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -4,14 +4,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
-    xmlns:ui="http://schemas.modernwpf.com/2019"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage3"
     mc:Ignorable="d">
     <Page.Resources>
         <Style x:Key="KbdLine" TargetType="Border">
             <Setter Property="CornerRadius" Value="8" />
-            <Setter Property="Margin" Value="0,4,0,4" />
+            <Setter Property="Margin" Value="0,3,0,3" />
             <Setter Property="Background" Value="{DynamicResource Color01B}" />
         </Style>
         <Style x:Key="Kbd" TargetType="Border">
@@ -60,7 +60,7 @@
                 VerticalScrollBarVisibility="Auto">
                 <Grid>
                     <StackPanel Margin="24,20,24,20">
-                        <StackPanel Margin="0,0,0,20">
+                        <StackPanel Margin="0,0,0,10">
                             <TextBlock
                                 FontSize="20"
                                 FontWeight="SemiBold"
@@ -155,6 +155,26 @@
                             </StackPanel>
                         </Border>
 
+                        <Border Style="{DynamicResource KbdLine}">
+                            <StackPanel Orientation="Horizontal">
+                                <StackPanel
+                                    Width="210"
+                                    Margin="20,5,4,5"
+                                    VerticalAlignment="Center"
+                                    Orientation="Horizontal">
+                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
+                                        <TextBlock Style="{DynamicResource KbdText}" Text="Tab" />
+                                    </Border>
+                                </StackPanel>
+                                <StackPanel VerticalAlignment="Center">
+                                    <TextBlock
+                                        VerticalAlignment="Center"
+                                        FontSize="13"
+                                        Text="{DynamicResource HotkeyTabDesc}" />
+                                </StackPanel>
+                            </StackPanel>
+                        </Border>
+
                         <Border Style="{DynamicResource KbdLine}">
                             <StackPanel Orientation="Horizontal">
                                 <StackPanel
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index f17c184415e..338b9640615 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -293,7 +293,7 @@ private void OpenSettingFolder(object sender, RoutedEventArgs e)
         private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
         {
             var WelcomeWindow = new WelcomeWindow(settings);
-            WelcomeWindow.Show();
+            WelcomeWindow.ShowDialog();
         }
         private void OpenLogFolder(object sender, RoutedEventArgs e)
         {
diff --git a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
index d758030663d..a62a032f7d5 100644
--- a/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml
@@ -1,20 +1,21 @@
-<UserControl x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings"
-        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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        d:DesignHeight="450" d:DesignWidth="800">
-    <Grid Margin="70 15 0 15">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings"
+    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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid Margin="70,15,0,15">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="250"/>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="400" />
+            <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-
-        <TextBlock Grid.Column="0" 
-                   Text="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}" 
-                   VerticalAlignment="Center" 
-                   FontSize="14"/>
-        <CheckBox Grid.Column="1" IsChecked="{Binding WarnFromUnknownSource}" />
+        <CheckBox
+            Grid.Column="0"
+            Padding="8,0,0,0"
+            Content="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
+            IsChecked="{Binding WarnFromUnknownSource}" />
     </Grid>
 </UserControl>