From 1d2a10cc1ca54bdb6d42679df096579a3d0f5a41 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Sun, 27 Oct 2013 12:58:46 +0100
Subject: [PATCH] synchronization between Disposer and focusSettlesDown

---
 .../src/com/intellij/ide/actions/SearchEverywhereAction.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
index 49a15d2fc717..6198973141ff 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
@@ -476,6 +476,8 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
       }
       else {
         focusManager.requestDefaultFocus(true);
+        final Component comp = myContextComponent;
+        final AnActionEvent event = myActionEvent;
         IdeFocusManager.getInstance(project).doWhenFocusSettlesDown(new Runnable() {
           @Override
           public void run() {
@@ -484,7 +486,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
               option.setOptionState(!option.isOptionEnabled());
             }
             else {
-              GotoActionAction.openOptionOrPerformAction(value, pattern, project, myContextComponent, myActionEvent);
+              GotoActionAction.openOptionOrPerformAction(value, pattern, project, comp, event);
             }
           }
         });