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 8d4ce3ffa1eb..ab4de72bddfb 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -477,6 +477,16 @@ public class FindPopupPanel extends JBPanel implements FindUI, DataProvider { return true; } }.installOn(myResultsPreviewTable); + myResultsPreviewTable.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent e) { + IdeFocusManager focusManager = IdeFocusManager.getInstance(myProject); + Component focusOwner = focusManager.getFocusOwner(); + if (focusOwner != null && SwingUtilities.isDescendingFrom(focusOwner, myUsagePreviewPanel)) { + focusManager.requestFocus(mySearchComponent, true); + } + } + }); applyFont(JBUI.Fonts.label(), myCbCaseSensitive, myCbPreserveCase, myCbWholeWordsOnly, myCbRegularExpressions, myResultsPreviewTable); ScrollingUtil.installActions(myResultsPreviewTable, false, mySearchComponent);