diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index c3942e5794b0f0d73f57e33b8c645476d4246531..d96a3f500872ac08614e32cf4a2cf266c4ea8ac7 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -571,6 +571,8 @@ CPPEditor::CPPEditor(QWidget *parent)
 
 CPPEditor::~CPPEditor()
 {
+    Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String("CppEditor.Rename"));
+
     m_semanticHighlighter->abort();
     m_semanticHighlighter->wait();
 }
@@ -763,13 +765,18 @@ void CPPEditor::renameUsages()
     Core::EditorManager::instance()->showEditorInfoBar(QLatin1String("CppEditor.Rename"),
                                                        tr("This change cannot be undone."),
                                                        tr("Yes, I know what I am doing."),
-                                                       this, SLOT(renameUsagesNow()));
+                                                       this, SLOT(hideRenameNotification()));
+    renameUsagesNow();
+}
+
+void CPPEditor::hideRenameNotification()
+{
+    Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String("CppEditor.Rename"));
 }
 
 void CPPEditor::renameUsagesNow()
 {
     if (Symbol *canonicalSymbol = markSymbols()) {
-        Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String("CppEditor.Rename"));
         m_modelManager->renameUsages(canonicalSymbol);
     }
 }
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index f3489d8b99806ea347ad54577a9ee755972b32c0..c0c323a93d9c644cb79ad57a59c85b7da3b1703f 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -196,6 +196,7 @@ public Q_SLOTS:
     void renameUsages();
     void findUsages();
     void renameUsagesNow();
+    void hideRenameNotification();
 
 protected:
     bool event(QEvent *e);
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 3c11479a02523583e73f1179bbe0f11346a4225f..7e3f04bc38105d9db08a1ab09f4ef4e5f4da86de 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -682,6 +682,8 @@ static void applyChanges(QTextDocument *doc, const QString &text, const QList<Fi
 void CppFindReferences::onReplaceButtonClicked(const QString &text,
                                                const QList<Find::SearchResultItem> &items)
 {
+    Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String("CppEditor.Rename"));
+
     if (text.isEmpty())
         return;