diff --git a/platform/platform-api/src/com/intellij/ui/SearchTextField.java b/platform/platform-api/src/com/intellij/ui/SearchTextField.java
index cc90398b5819..a561df838b8e 100644
--- a/platform/platform-api/src/com/intellij/ui/SearchTextField.java
+++ b/platform/platform-api/src/com/intellij/ui/SearchTextField.java
@@ -44,6 +44,7 @@ public class SearchTextField extends JPanel {
   private JBPopup myPopup;
   private String myHistoryPropertyName;
   private final boolean historyPopupEnabled;
+  private boolean init = true;
 
   public SearchTextField() {
     this(true);
@@ -152,6 +153,7 @@ public class SearchTextField extends JPanel {
     DumbAwareAction.create(event -> {
       showPopup();
     }).registerCustomShortcutSet(KeymapUtil.getActiveKeymapShortcuts("ShowSearchHistory"), myTextField);
+    init = false;
   }
 
   @Override
@@ -378,14 +380,16 @@ public class SearchTextField extends JPanel {
   }
 
   private void reInitPopup() {
-    hidePopup();
-    final JList<String> list = new JBList<>(myModel);
-    final Runnable chooseRunnable = createItemChosenCallback(list);
-    if(ApplicationManager.getApplication() != null && JBPopupFactory.getInstance() != null) {
-      myPopup = JBPopupFactory.getInstance().createListPopupBuilder(list)
-        .setMovable(false)
-        .setRequestFocus(true)
-        .setItemChoosenCallback(chooseRunnable).createPopup();
+    if(!init) {
+      hidePopup();
+      final JList<String> list = new JBList<>(myModel);
+      final Runnable chooseRunnable = createItemChosenCallback(list);
+      if (ApplicationManager.getApplication() != null && JBPopupFactory.getInstance() != null) {
+        myPopup = JBPopupFactory.getInstance().createListPopupBuilder(list)
+          .setMovable(false)
+          .setRequestFocus(true)
+          .setItemChoosenCallback(chooseRunnable).createPopup();
+      }
     }
   }