diff --git a/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs b/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs
index d0cca33a5..71020369a 100644
--- a/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs
+++ b/Flow.Launcher.Infrastructure/UserSettings/CustomShortcutModel.cs
@@ -59,7 +59,7 @@ namespace Flow.Launcher.Infrastructure.UserSettings
         {
             Key = key;
             Description = description;
-            Expand = expand ?? (() => { return Key; });
+            Expand = expand ?? (() => { return ""; });
         }
     }
 }
diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml
index 10bd6223c..78b392f3e 100644
--- a/Flow.Launcher/CustomShortcutSetting.xaml
+++ b/Flow.Launcher/CustomShortcutSetting.xaml
@@ -117,6 +117,7 @@
                             LastChildFill="True">
                             <Button
                                 x:Name="btnTestShortcut"
+                                Margin="0,0,10,0"
                                 Padding="10,5,10,5"
                                 Click="BtnTestShortcut_OnClick"
                                 Content="{DynamicResource preview}"
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 45f0119a1..6d66184f5 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -2520,6 +2520,7 @@
                                     Text="{DynamicResource customQueryShortcut}" />
                                 <ListView
                                     Grid.Row="7"
+                                    Name="customShortcutView"
                                     MinHeight="160"
                                     Margin="0,6,0,0"
                                     Background="{DynamicResource Color02B}"
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index d8162020f..50e034f33 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -421,8 +421,9 @@ namespace Flow.Launcher
             var shortcutSettingWindow = new CustomShortcutSetting(item, settings);
             if (shortcutSettingWindow.ShowDialog() == true)
             {
-                settings.CustomShortcuts.Remove(item);
-                settings.CustomShortcuts.Add(shortcutSettingWindow.ShortCut);
+                item.Key = shortcutSettingWindow.Key;
+                item.Value = shortcutSettingWindow.Value;
+                customShortcutView.Items.Refresh();
             }
         }