diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 4dc85dbfa11..0bd10af7ae1 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -679,8 +679,7 @@ void EditorManagerPrivate::doEscapeKeyFocusMoveMagic()
     if (findPane && findPane->isVisible() && findPane->isUsedByWidget(focus)) {
         findPane->hide();
         stuffHidden = true;
-    }
-    if (!( editorViewVisible && !editorViewActive && editorView->window() == activeWindow )) {
+    } else if (!( editorViewVisible && !editorViewActive && editorView->window() == activeWindow )) {
         QWidget *outputPane = OutputPanePlaceHolder::getCurrent();
         if (outputPane && outputPane->isVisible() && outputPane->window() == activeWindow) {
             OutputPaneManager::instance()->slotHide();
@@ -691,6 +690,10 @@ void EditorManagerPrivate::doEscapeKeyFocusMoveMagic()
             RightPaneWidget::instance()->setShown(false);
             stuffHidden = true;
         }
+        if (findPane && findPane->isVisible() && findPane->window() == activeWindow) {
+            findPane->hide();
+            stuffHidden = true;
+        }
     }
     if (stuffHidden)
         return;