diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 5c0ce69c97d..a449ec0e399 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -325,8 +325,11 @@ bool FindToolBar::eventFilter(QObject *obj, QEvent *event)
 void FindToolBar::adaptToCandidate()
 {
     updateFindAction();
-    if (findToolBarPlaceHolder() == Core::FindToolBarPlaceHolder::getCurrent())
+    if (findToolBarPlaceHolder() == Core::FindToolBarPlaceHolder::getCurrent()) {
         m_currentDocumentFind->acceptCandidate();
+        if (isVisible())
+            m_currentDocumentFind->highlightAll(getFindText(), effectiveFindFlags());
+    }
 }
 
 void FindToolBar::updateFindAction()