diff --git a/src/plugins/cpptools/cpptoolseditorsupport.cpp b/src/plugins/cpptools/cpptoolseditorsupport.cpp
index 3e1619117cd..66d2f8adcea 100644
--- a/src/plugins/cpptools/cpptoolseditorsupport.cpp
+++ b/src/plugins/cpptools/cpptoolseditorsupport.cpp
@@ -260,7 +260,7 @@ CppCompletionAssistProvider *CppEditorSupport::completionAssistProvider() const
 QSharedPointer<SnapshotUpdater> CppEditorSupport::snapshotUpdater()
 {
     QSharedPointer<SnapshotUpdater> updater = m_snapshotUpdater;
-    if (!updater) {
+    if (!updater || updater->fileInEditor() != fileName()) {
         updater = QSharedPointer<SnapshotUpdater>(new SnapshotUpdater(fileName()));
         m_snapshotUpdater = updater;