diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 124115ffe..db6269f16 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -62,92 +62,84 @@
                 </Grid>
             </StackPanel>
             <StackPanel Margin="26,0,26,0">
-                <StackPanel Grid.Row="0" Margin="0,0,0,12">
-                    <TextBlock
-                        Grid.Column="0"
-                        Margin="0,0,0,0"
-                        FontSize="20"
-                        FontWeight="SemiBold"
-                        Text="{DynamicResource customeQueryHotkeyTitle}"
-                        TextAlignment="Left" />
-                </StackPanel>
-                <StackPanel>
-                    <TextBlock
-                        FontSize="14"
-                        Text="{DynamicResource customeQueryHotkeyTips}"
-                        TextAlignment="Left"
-                        TextWrapping="WrapWithOverflow" />
-                    <Image
-                        Width="478"
-                        Margin="0,20,0,0"
-                        Source="/Images/illustration_01.png" />
-                </StackPanel>
+                <TextBlock
+                    Margin="0,0,0,12"
+                    FontSize="20"
+                    FontWeight="SemiBold"
+                    Text="{DynamicResource customeQueryHotkeyTitle}"
+                    TextAlignment="Left" />
+                <TextBlock
+                    FontSize="14"
+                    Text="{DynamicResource customeQueryHotkeyTips}"
+                    TextAlignment="Left"
+                    TextWrapping="WrapWithOverflow" />
+                <Image
+                    Width="478"
+                    Margin="0,20,0,0"
+                    Source="/Images/illustration_01.png" />
 
-                <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
-                    <Grid Width="478">
-                        <Grid.RowDefinitions>
-                            <RowDefinition />
-                            <RowDefinition />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="0"
-                            Margin="10"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource hotkey}" />
-                        <StackPanel
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Orientation="Horizontal">
-                            <flowlauncher:HotkeyControl
-                                x:Name="HotkeyControl"
-                                Grid.Column="1"
-                                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"
-                            Margin="10"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            FontSize="14"
-                            Text="{DynamicResource customQuery}" />
-                        <DockPanel
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            LastChildFill="True">
-                            <Button
-                                x:Name="btnTestActionKeyword"
-                                Margin="0,0,10,0"
-                                Padding="10,5,10,5"
-                                Click="BtnTestActionKeyword_OnClick"
-                                Content="{DynamicResource preview}"
-                                DockPanel.Dock="Right" />
-                            <TextBox
-                                x:Name="tbAction"
-                                Margin="10"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center" />
-                        </DockPanel>
-                    </Grid>
-                </StackPanel>
+                <Grid Margin="0,20,0,0" Width="478">
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource hotkey}" />
+                    <flowlauncher:HotkeyControl
+                        Grid.Row="0"
+                        Grid.Column="1"
+                        Grid.ColumnSpan="2"
+                        x:Name="HotkeyControl"
+                        DefaultHotkey=""
+                        Margin="10,0,10,0"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        HorizontalContentAlignment="Left" />
+                    <!--<TextBlock
+                        Grid.Row="0"
+                        Grid.Column="2"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource actionKeyword}" />-->
+
+                    <TextBlock
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="10"
+                        HorizontalAlignment="Left"
+                        VerticalAlignment="Center"
+                        FontSize="14"
+                        Text="{DynamicResource customQuery}" />
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        x:Name="tbAction"
+                        Margin="10"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Center" />
+                    <Button
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        x:Name="btnTestActionKeyword"
+                        Margin="0,0,10,0"
+                        Padding="10,5,10,5"
+                        Click="BtnTestActionKeyword_OnClick"
+                        Content="{DynamicResource preview}" />
+                </Grid>
             </StackPanel>
         </StackPanel>
         <Border
@@ -174,4 +166,4 @@
             </StackPanel>
         </Border>
     </Grid>
-</Window>
\ No newline at end of file
+</Window>
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
index c84a2f9d9..cf10c5dca 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -31,18 +31,14 @@ namespace Flow.Launcher
 
         private void btnAdd_OnClick(object sender, RoutedEventArgs e)
         {
+            if (HotkeyControl.IsEmpty)
+            {
+                MessageBox.Show("Hotkey cannot be empty.");
+                return;
+            }
             if (!update)
             {
-                if (!HotkeyControl.CurrentHotkeyAvailable)
-                {
-                    MessageBox.Show(InternationalizationManager.Instance.GetTranslation("hotkeyIsNotUnavailable"));
-                    return;
-                }
-
-                if (_settings.CustomPluginHotkeys == null)
-                {
-                    _settings.CustomPluginHotkeys = new ObservableCollection<CustomPluginHotkey>();
-                }
+                _settings.CustomPluginHotkeys ??= new ObservableCollection<CustomPluginHotkey>();
 
                 var pluginHotkey = new CustomPluginHotkey
                 {
@@ -54,13 +50,6 @@ namespace Flow.Launcher
             }
             else
             {
-                if (updateCustomHotkey.Hotkey != HotkeyControl.CurrentHotkey.ToString() &&
-                    !HotkeyControl.CurrentHotkeyAvailable)
-                {
-                    MessageBox.Show(InternationalizationManager.Instance.GetTranslation("hotkeyIsNotUnavailable"));
-                    return;
-                }
-
                 var oldHotkey = updateCustomHotkey.Hotkey;
                 updateCustomHotkey.ActionKeyword = tbAction.Text;
                 updateCustomHotkey.Hotkey = HotkeyControl.CurrentHotkey.ToString();
@@ -105,12 +94,10 @@ namespace Flow.Launcher
 
         private void window_MouseDown(object sender, MouseButtonEventArgs e) /* for close hotkey popup */
         {
-            TextBox textBox = Keyboard.FocusedElement as TextBox;
-            if (textBox != null)
-            {
-                TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next);
-                textBox.MoveFocus(tRequest);
-            }
+            if (Keyboard.FocusedElement is not TextBox textBox) return;
+
+            TraversalRequest tRequest = new TraversalRequest(FocusNavigationDirection.Next);
+            textBox.MoveFocus(tRequest);
         }
     }
 }
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index de708e24b..bece67de2 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -78,6 +78,7 @@ namespace Flow.Launcher
             InitializeComponent();
 
             HotkeyList.ItemsSource = KeysToDisplay;
+            SetKeysToDisplay(CurrentHotkey);
         }
 
         /*------------------ New Logic Structure Part------------------------*/
@@ -157,6 +158,7 @@ namespace Flow.Launcher
 
         public ObservableCollection<string> KeysToDisplay { get; set; } = new ObservableCollection<string>();
 
+        public bool IsEmpty => KeysToDisplay.Count == 0 || (KeysToDisplay.Count == 1 && KeysToDisplay[0] == EmptyHotkey);
 
         public HotkeyModel CurrentHotkey { get; private set; } = new(false, false, false, false, Key.None);