diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp
index 631eb0f248f..559583db006 100644
--- a/src/plugins/vcsbase/vcsbaseplugin.cpp
+++ b/src/plugins/vcsbase/vcsbaseplugin.cpp
@@ -309,10 +309,13 @@ void StateListener::slotStateChanged()
         state.clearPatchFile(); // Need a repository to patch
 
     qCDebug(stateLog).noquote() << "VC:" << (vc ? vc->displayName() : QString("None")) << state;
-    QTimer::singleShot(500, this, [this, state, vc] {
+
+    auto updateState = [this, state, vc] {
         EditorManager::updateWindowTitles();
         emit stateChanged(state, vc);
-    });
+    };
+    updateState();
+    QTimer::singleShot(500, this, updateState); // QTCREATORBUG-31815
 }
 
 } // namespace Internal