diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index 8b3b62a99d8bac17df242087ea1a0166bffd5c87..161894c8e796165a074fe7da3c6b0386571b9463 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -861,6 +861,9 @@ void CPPEditor::onContentsChanged(int position, int charsRemoved, int charsAdded
     Q_UNUSED(position)
     Q_UNUSED(charsAdded)
 
+    if (m_currentRenameSelection == -1)
+        return;
+
     if (!m_inRename)
         abortRename();