Maintain focus when hotkey invalid

Author: VictoriousRaptor

Flow.Launcher/HotkeyControl.xaml.cs

@@ -63,23 +63,35 @@ private void TbHotkey_OnPreviewKeyDown(object sender, KeyEventArgs e)
 
         public async Task SetHotkeyAsync(HotkeyModel keyModel, bool triggerValidate = true)
         {
-            CurrentHotkey = keyModel;
-
-            tbHotkey.Text = CurrentHotkey.ToString();
+            tbHotkey.Text = keyModel.ToString();
             tbHotkey.Select(tbHotkey.Text.Length, 0);
 
             if (triggerValidate)
             {
                 bool hotkeyAvailable = CheckHotkeyAvailability(keyModel);
+                CurrentHotkeyAvailable = hotkeyAvailable;
                 SetMessage(hotkeyAvailable);
                 OnHotkeyChanged();
 
                 var token = hotkeyUpdateSource.Token;
                 await Task.Delay(500, token);
                 if (token.IsCancellationRequested)
                     return;
+
+                if (CurrentHotkeyAvailable)
+                {
+                    CurrentHotkey = keyModel;
+                }
+                // triggers lost focus
                 FocusManager.SetFocusedElement(FocusManager.GetFocusScope(this), null);
-                Keyboard.ClearFocus();
+                if (CurrentHotkeyAvailable)
+                {
+                    Keyboard.ClearFocus();
+                }
+            }
+            else
+            {
+                CurrentHotkey = keyModel;
             }
         }