diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp
index 0cad2b85e94..73686384092 100644
--- a/src/plugins/bazaar/bazaarplugin.cpp
+++ b/src/plugins/bazaar/bazaarplugin.cpp
@@ -681,7 +681,7 @@ void BazaarPlugin::commitFromEditor()
 {
     // Close the submit editor
     m_submitActionTriggered = true;
-    EditorManager::closeEditor();
+    EditorManager::closeEditor(submitEditor());
 }
 
 void BazaarPlugin::uncommit()
diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp
index 3fab90897df..496c53f964c 100644
--- a/src/plugins/clearcase/clearcaseplugin.cpp
+++ b/src/plugins/clearcase/clearcaseplugin.cpp
@@ -1475,7 +1475,7 @@ void ClearCasePlugin::describe(const QString &source, const QString &changeNr)
 void ClearCasePlugin::checkInSelected()
 {
     m_submitActionTriggered = true;
-    EditorManager::closeEditor();
+    EditorManager::closeEditor(submitEditor());
 }
 
 QString ClearCasePlugin::runCleartoolSync(const QString &workingDir,
diff --git a/src/plugins/coreplugin/editormanager/editorwindow.cpp b/src/plugins/coreplugin/editormanager/editorwindow.cpp
index c6036de2b03..79feec7538e 100644
--- a/src/plugins/coreplugin/editormanager/editorwindow.cpp
+++ b/src/plugins/coreplugin/editormanager/editorwindow.cpp
@@ -62,6 +62,12 @@ EditorWindow::EditorWindow(QWidget *parent) :
     updateWindowTitle();
 }
 
+EditorWindow::~EditorWindow()
+{
+    disconnect(m_area, &EditorArea::windowTitleNeedsUpdate,
+               this, &EditorWindow::updateWindowTitle);
+}
+
 EditorArea *EditorWindow::editorArea() const
 {
     return m_area;
diff --git a/src/plugins/coreplugin/editormanager/editorwindow.h b/src/plugins/coreplugin/editormanager/editorwindow.h
index eecb7586a6e..084e3771961 100644
--- a/src/plugins/coreplugin/editormanager/editorwindow.h
+++ b/src/plugins/coreplugin/editormanager/editorwindow.h
@@ -42,6 +42,7 @@ class EditorWindow : public QWidget
     Q_OBJECT
 public:
     explicit EditorWindow(QWidget *parent = 0);
+    ~EditorWindow();
 
     EditorArea *editorArea() const;
 
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp
index 2efc277ea0a..69948e3365c 100644
--- a/src/plugins/cvs/cvsplugin.cpp
+++ b/src/plugins/cvs/cvsplugin.cpp
@@ -1122,7 +1122,7 @@ bool CvsPlugin::describe(const QString &repositoryPath,
 void CvsPlugin::submitCurrentLog()
 {
     m_submitActionTriggered = true;
-    EditorManager::closeEditor(EditorManager::currentEditor());
+    EditorManager::closeEditor(submitEditor());
 }
 
 // Run CVS. At this point, file arguments must be relative to
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index 86eca7b04a2..33d41f952db 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -1014,7 +1014,7 @@ void GitPlugin::submitCurrentLog()
 {
     // Close the submit editor
     m_submitActionTriggered = true;
-    EditorManager::closeEditor();
+    EditorManager::closeEditor(submitEditor());
 }
 
 bool GitPlugin::submitEditorAboutToClose()
diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp
index b962744d986..8789987cf45 100644
--- a/src/plugins/mercurial/mercurialplugin.cpp
+++ b/src/plugins/mercurial/mercurialplugin.cpp
@@ -596,7 +596,7 @@ void MercurialPlugin::commitFromEditor()
 {
     // Close the submit editor
     m_submitActionTriggered = true;
-    Core::EditorManager::closeEditor();
+    Core::EditorManager::closeEditor(submitEditor());
 }
 
 bool MercurialPlugin::submitEditorAboutToClose()
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp
index eee131f369d..498c1688248 100644
--- a/src/plugins/perforce/perforceplugin.cpp
+++ b/src/plugins/perforce/perforceplugin.cpp
@@ -1329,7 +1329,7 @@ void PerforcePlugin::describe(const QString & source, const QString &n)
 void PerforcePlugin::submitCurrentLog()
 {
     m_submitActionTriggered = true;
-    EditorManager::closeEditor(EditorManager::currentEditor());
+    EditorManager::closeEditor(submitEditor());
 }
 
 void PerforcePlugin::cleanCommitMessageFile()
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 12a68f84d0b..6affa58cfda 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -981,7 +981,7 @@ void SubversionPlugin::slotDescribe()
 void SubversionPlugin::submitCurrentLog()
 {
     m_submitActionTriggered = true;
-    EditorManager::closeEditor(EditorManager::currentEditor());
+    EditorManager::closeEditor(submitEditor());
 }
 
 SubversionResponse