diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
index 5eac84a1278c..e336fda42107 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
@@ -81,7 +81,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
           project.putUserData(ChooseByNamePopup.CHOOSE_BY_NAME_POPUP_IN_PROJECT_KEY, null);
         }
         String enteredText = popup.getTrimmedText();
-        openOptionOrPerformAction(((GotoActionModel.MatchedValue)element).value, enteredText, project, component, e);
+        openOptionOrPerformAction(((GotoActionModel.MatchedValue)element).value, enteredText, project, component);
       }
     };
 
@@ -281,8 +281,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
   public static void openOptionOrPerformAction(@NotNull Object element,
                                                final String enteredText,
                                                @Nullable final Project project,
-                                               Component component,
-                                               @Nullable AnActionEvent e) {
+                                               Component component) {
     if (element instanceof OptionDescription) {
       OptionDescription optionDescription = (OptionDescription)element;
       final String configurableId = optionDescription.getConfigurableId();
@@ -296,7 +295,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
     }
     else {
       ApplicationManager.getApplication().invokeLater(() -> IdeFocusManager.getInstance(project).doWhenFocusSettlesDown(
-        () -> performAction(element, component, e)));
+        () -> performAction(element, component, null)));
     }
   }
 
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 d19c2b219c80..64fe59c5a156 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
@@ -528,7 +528,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
             }
           }
           else {
-            GotoActionAction.openOptionOrPerformAction(value, pattern, project, c, event);
+            GotoActionAction.openOptionOrPerformAction(value, pattern, project, c);
           }
         });
         return ()->{};