diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index ab4de72bddfb..166c6077b73b 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -482,7 +482,7 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider { public void mousePressed(MouseEvent e) { IdeFocusManager focusManager = IdeFocusManager.getInstance(myProject); Component focusOwner = focusManager.getFocusOwner(); - if (focusOwner != null && SwingUtilities.isDescendingFrom(focusOwner, myUsagePreviewPanel)) { + if (focusOwner != null && SwingUtilities.isDescendingFrom(focusOwner, FindPopupPanel.this) && focusOwner != myReplaceComponent) { focusManager.requestFocus(mySearchComponent, true); } }