diff --git a/GitUI/CommandsDialogs/FormSettings.cs b/GitUI/CommandsDialogs/FormSettings.cs
index 153c47f04e3..21ced7c4d9d 100644
--- a/GitUI/CommandsDialogs/FormSettings.cs
+++ b/GitUI/CommandsDialogs/FormSettings.cs
@@ -252,6 +252,8 @@ private bool Save()
                 // TODO: this method has a generic sounding name but only saves some specific settings
                 AppSettings.SaveSettings();
 
+                DialogResult = DialogResult.OK;
+
                 return true;
             }
             catch (SaveSettingsException ex) when (ex.InnerException is not null)
diff --git a/GitUI/GitUICommands.cs b/GitUI/GitUICommands.cs
index d0db306d421..5b0d1fd5198 100644
--- a/GitUI/GitUICommands.cs
+++ b/GitUI/GitUICommands.cs
@@ -902,9 +902,8 @@ public bool StartSettingsDialog(IWin32Window? owner = null, SettingsPageReferenc
         {
             bool Action()
             {
-                FormSettings.ShowSettingsDialog(this, owner, initialPage);
-
-                return true;
+                return FormSettings.ShowSettingsDialog(this, owner, initialPage)
+                    is DialogResult.OK;
             }
 
             return DoActionOnRepo(owner, Action, requiresValidWorkingDir: false, postEvent: PostSettings);