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 49a4e3249457..1e0b3b261223 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -206,7 +206,11 @@ public class FindPopupPanel extends JBPanel implements FindUI { } showPoint = new RelativePoint(parent, new Point((parent.getSize().width - getPreferredSize().width) / 2, height)); } - mySearchComponent.selectAll(); + ApplicationManager.getApplication().invokeLater(() -> { + if (mySearchComponent.getCaret() != null) { + mySearchComponent.selectAll(); + } + }); WindowMoveListener windowListener = new WindowMoveListener(this); myTitlePanel.addMouseListener(windowListener); myTitlePanel.addMouseMotionListener(windowListener);