diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 78ee72d147f..7aa9a73a36e 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -348,8 +348,6 @@ void FindToolBar::updateToolBar()
     bool replaceEnabled = enabled && m_currentDocumentFind->supportsReplace();
     bool showAllControls = canShowAllControls(replaceEnabled);
 
-    m_goToCurrentFindAction->setEnabled(enabled);
-
     m_findNextAction->setEnabled(enabled);
     m_findPreviousAction->setEnabled(enabled);
 
@@ -618,9 +616,11 @@ void FindToolBar::updateFlagMenus()
     m_preserveCaseAction->setEnabled((supportedFlags & FindPreserveCase) && !regexp && replaceEnabled);
 }
 
-bool FindToolBar::setFocusToCurrentFindSupport()
+void FindToolBar::setFocusToCurrentFindSupport()
 {
-    return m_currentDocumentFind->setFocusToCurrentFindSupport();
+    if (!m_currentDocumentFind->setFocusToCurrentFindSupport())
+        if (QWidget *w = focusWidget())
+            w->clearFocus();
 }
 
 void FindToolBar::hideAndResetFocus()
diff --git a/src/plugins/coreplugin/find/findtoolbar.h b/src/plugins/coreplugin/find/findtoolbar.h
index 1951c61e391..6990bc5c2bb 100644
--- a/src/plugins/coreplugin/find/findtoolbar.h
+++ b/src/plugins/coreplugin/find/findtoolbar.h
@@ -119,7 +119,7 @@ private slots:
 
     void adaptToCandidate();
 
-    bool setFocusToCurrentFindSupport();
+    void setFocusToCurrentFindSupport();
 
 protected:
     bool focusNextPrevChild(bool next);