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 b08af33a9562..ac6ca2aa064e 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionAction.java
@@ -58,7 +58,7 @@ public class GotoActionAction extends GotoActionBase implements DumbAware {
           }, ModalityState.NON_MODAL);
         }
       }
-    });
+    }, null, false);
   }
 
 }
\ No newline at end of file
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 cc3af382d3a4..51316de9e2b4 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoActionBase.java
@@ -119,21 +119,22 @@ public abstract class GotoActionBase extends AnAction {
   }
 
   protected static <T> void showNavigationPopup(AnActionEvent e, ChooseByNameModel model, final GotoActionCallback<T> callback) {
-    showNavigationPopup(e, model, callback, null);
+    showNavigationPopup(e, model, callback, null, true);
   }
 
   protected static <T> void showNavigationPopup(AnActionEvent e,
                                                 ChooseByNameModel model,
                                                 final GotoActionCallback<T> callback,
-                                                final String findTitle) {
+                                                @Nullable final String findUsagesTitle,
+                                                boolean useSelectionFromEditor) {
     final Project project = e.getData(PlatformDataKeys.PROJECT);
 
     boolean mayRequestOpenInCurrentWindow = model.willOpenEditor() && FileEditorManagerEx.getInstanceEx(project).hasSplitOrUndockedWindows();
     final Class startedAction = myInAction;
     LOG.assertTrue(startedAction != null);
-    Pair<String, Integer> start = getInitialText(e.getData(PlatformDataKeys.EDITOR));
+    Pair<String, Integer> start = getInitialText(useSelectionFromEditor ? e.getData(PlatformDataKeys.EDITOR) : null);
     final ChooseByNamePopup popup = ChooseByNamePopup.createPopup(project, model, getPsiContext(e), start.first, mayRequestOpenInCurrentWindow, start.second);
-    popup.setFindUsagesTitle(findTitle);
+    popup.setFindUsagesTitle(findUsagesTitle);
     final ChooseByNameFilter<T> filter = callback.createFilter(popup);
 
     popup.invoke(new ChooseByNamePopupComponent.Callback() {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java
index 669a59827bad..95e3b2d08bc5 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoClassAction.java
@@ -78,7 +78,7 @@ public class GotoClassAction extends GotoActionBase implements DumbAware {
           token.finish();
         }
       }
-    }, "Classes matching pattern");
+    }, "Classes matching pattern", true);
   }
 
   private static PsiElement getElement(PsiElement element, ChooseByNamePopup popup) {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java
index 8836e5218d0f..4e3e8bab6794 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoFileAction.java
@@ -81,7 +81,7 @@ public class GotoFileAction extends GotoActionBase implements DumbAware {
           }
         }, ModalityState.NON_MODAL);
       }
-    }, "Files matching pattern");
+    }, "Files matching pattern", true);
   }
 
   protected static class GotoFileFilter extends ChooseByNameFilter<FileType> {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java
index f2bcc74bb861..0f309f4a64da 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoSymbolAction.java
@@ -46,7 +46,7 @@ public class GotoSymbolAction extends GotoActionBase {
       public void elementChosen(ChooseByNamePopup popup, Object element) {
         EditSourceUtil.navigate((NavigationItem)element, true, popup.isOpenInCurrentWindowRequested());
       }
-    }, "Symbols matching patterns");
+    }, "Symbols matching patterns", true);
   }
 
   protected boolean hasContributors(DataContext dataContext) {
diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index bb6e4f386806..f6dba96249fe 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -218,7 +218,7 @@ public abstract class ChooseByNameBase {
     myToolArea = toolArea;
   }
 
-  public void setFindUsagesTitle(String findUsagesTitle) {
+  public void setFindUsagesTitle(@Nullable String findUsagesTitle) {
     myFindUsagesTitle = findUsagesTitle;
   }