diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs
index 8ef7c70739..afafbd3245 100644
--- a/src/MaaWpfGui/Main/SettingsViewModel.cs
+++ b/src/MaaWpfGui/Main/SettingsViewModel.cs
@@ -2181,7 +2181,7 @@ namespace MaaWpfGui
                     if (SaveGUIParametersOnClosing)
                     {
                         Application.Current.MainWindow.Closing += SaveGUIParameters;
-                        Application.Current.Exit += SaveGUIParameters;
+                        Application.Current.MainWindow.Closed += SaveGUIParameters;
                     }
                     else
                     {
@@ -2206,12 +2206,12 @@ namespace MaaWpfGui
                 if (value)
                 {
                     Application.Current.MainWindow.Closing += SaveGUIParameters;
-                    Application.Current.Exit += SaveGUIParameters;
+                    Application.Current.MainWindow.Closed += SaveGUIParameters;
                 }
                 else
                 {
                     Application.Current.MainWindow.Closing -= SaveGUIParameters;
-                    Application.Current.Exit -= SaveGUIParameters;
+                    Application.Current.MainWindow.Closed -= SaveGUIParameters;
                 }
             }
         }
diff --git a/src/MaaWpfGui/Main/TaskQueueViewModel.cs b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
index 32dcdeffad..9d25bb07db 100644
--- a/src/MaaWpfGui/Main/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/Main/TaskQueueViewModel.cs
@@ -129,7 +129,7 @@ namespace MaaWpfGui
             if (_settingsViewModel.LoadGUIParameters && _settingsViewModel.SaveGUIParametersOnClosing)
             {
                 Application.Current.MainWindow.Closing += _settingsViewModel.SaveGUIParameters;
-                Application.Current.Exit += _settingsViewModel.SaveGUIParameters;
+                Application.Current.MainWindow.Closed += _settingsViewModel.SaveGUIParameters;
             }
         }