diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
index 2a54f36cf6c..7def2dc94f7 100644
--- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
+++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp
@@ -592,7 +592,9 @@ VcsBaseSubmitEditor::PromptSubmitResult
     // On Windows there is no mnemonic for Close. Set it explicitly.
     mb.button(QDialogButtonBox::Close)->setText(tr("&Close"));
     cancelButton->setText(tr("&Keep Editing"));
-    cancelButton->setDefault(true);
+    // forcePrompt is true when the editor is closed, and false when triggered by the submit action
+    if (forcePrompt)
+        cancelButton->setDefault(true);
     if (QPushButton *commitButton = mb.button(QDialogButtonBox::Ok)) {
         commitButton->setText(withUnusedMnemonic(commitName,
                               {cancelButton, mb.button(QDialogButtonBox::Close)}));