diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
index dd3afc04bb4e..f7586f8ce300 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
@@ -175,7 +175,8 @@ public abstract class GotoActionBase extends AnAction {
       @Override
       public void onClose() {
         ourLastStrings.put(myInAction, Pair.create(popup.getEnteredText(), popup.getSelectedIndex()));
-        if (startedAction.equals(myInAction)) {
+        //noinspection ConstantConditions
+        if (startedAction != null && startedAction.equals(myInAction)) {
           myInAction = null;
         }
         if (filter != null) {