diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
index a97a328e6fe..c7c1aaa4070 100644
--- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
+++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -775,8 +775,12 @@ public bool EditSelectedCustomShortcut()
             var shortcutSettingWindow = new CustomShortcutSetting(item.Key, item.Value, this);
             if (shortcutSettingWindow.ShowDialog() == true)
             {
+                // Fix un-selectable shortcut item after the first selection
+                // https://stackoverflow.com/questions/16789360/wpf-listbox-items-with-changing-hashcode
+                SelectedCustomShortcut = null;
                 item.Key = shortcutSettingWindow.Key;
                 item.Value = shortcutSettingWindow.Value;
+                SelectedCustomShortcut = item;
                 return true;
             }
             return false;