diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index a48a228ab2d..004a8ccfe0d 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -187,6 +187,8 @@ void CppEditorWidget::finalizeInitialization()
                 d->m_lastSemanticInfo.localUses = localUses;
     });
 
+    connect(document(), SIGNAL(contentsChange(int,int,int)),
+            &d->m_localRenaming, SLOT(onContentsChangeOfEditorWidgetDocument(int,int,int)));
     connect(&d->m_localRenaming, &CppLocalRenaming::finished, [this] {
         cppEditorDocument()->semanticRehighlight();
     });
diff --git a/src/plugins/cppeditor/cpplocalrenaming.cpp b/src/plugins/cppeditor/cpplocalrenaming.cpp
index e81b8e66aec..4eabf49f3d5 100644
--- a/src/plugins/cppeditor/cpplocalrenaming.cpp
+++ b/src/plugins/cppeditor/cpplocalrenaming.cpp
@@ -68,8 +68,6 @@ CppLocalRenaming::CppLocalRenaming(TextEditor::BaseTextEditorWidget *editorWidge
     , m_firstRenameChangeExpected(false)
 {
     forgetRenamingSelection();
-    connect(m_editorWidget->document(), SIGNAL(contentsChange(int,int,int)),
-            this, SLOT(onContentsChangeOfEditorWidgetDocument(int,int,int)));
 }
 
 void CppLocalRenaming::updateSelectionsForVariableUnderCursor(