From f3e86bd2d9d3d9839a65da4e80a49210ab38c08e Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 5 Aug 2014 20:16:56 +0200
Subject: [PATCH] hang in Search Everywhere

---
 .../src/com/intellij/ide/util/gotoByName/GotoActionModel.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
index c01f31ccf4a5..348283dc3885 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
@@ -89,6 +89,9 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel, C
       }
     }
     myIndex = SearchableOptionsRegistrar.getInstance();
+    if (!EventQueue.isDispatchThread()) {
+      return;
+    }
     fillConfigurablesNames(ShowSettingsUtilImpl.getConfigurables(project, true));
   }