diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index 7c6b2c9b3..2788583da 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -92,14 +92,12 @@
                 Grid.Column="1"
                 Width="Auto"
                 Checked="HotkeyBtn_OnChecked"
-                Unchecked="HotkeyBtn_OnUnchecked"
                 FontSize="13"
                 FontWeight="Bold"
                 Foreground="{DynamicResource Color01B}"
                 GroupName="HotkeyReg"
                 KeyboardNavigation.TabNavigation="Continue"
                 PreviewKeyDown="OnPreviewKeyDown"
-                LostFocus="HotkeyBtn_OnLostFocus"
                 Style="{StaticResource {x:Type ToggleButton}}">
                 <RadioButton.Template>
                     <ControlTemplate TargetType="RadioButton">
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index 4eb475f74..4c86a1eac 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -51,6 +51,7 @@ namespace Flow.Launcher
             if (d is HotkeyControl hotkeyControl)
             {
                 hotkeyControl.SetKeysToDisplay(new HotkeyModel(hotkeyControl.Hotkey));
+                hotkeyControl.CurrentHotkey = new HotkeyModel(hotkeyControl.Hotkey);
             }
         }
 
@@ -202,8 +203,6 @@ namespace Flow.Launcher
 
         private void ResetToDefault()
         {
-            HotkeyBtn.IsChecked = false;
-
             if (!string.IsNullOrEmpty(Hotkey))
                 HotKeyMapper.RemoveHotkey(Hotkey);
             Hotkey = DefaultHotkey;
@@ -212,6 +211,8 @@ namespace Flow.Launcher
             SetKeysToDisplay(CurrentHotkey);
 
             SetHotkey(CurrentHotkey);
+
+            HotkeyBtn.IsChecked = false;
         }
 
 
@@ -241,12 +242,11 @@ namespace Flow.Launcher
 
         public void Delete()
         {
-            HotkeyBtn.IsChecked = false;
-
             if (!string.IsNullOrEmpty(Hotkey))
                 HotKeyMapper.RemoveHotkey(Hotkey);
             Hotkey = "";
             SetKeysToDisplay(KeysToDisplay, new List<string>());
+            HotkeyBtn.IsChecked = false;
         }
 
         private void SetKeysToDisplay(HotkeyModel hotkey)