diff --git a/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationsAction.java b/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationsAction.java
index 29f6f4c5319f..bed3943e1ebf 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationsAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/RecentLocationsAction.java
@@ -397,7 +397,10 @@ public class RecentLocationsAction extends DumbAwareAction {
                                          @NotNull JBList<RecentLocationItem> list,
                                          @NotNull JBPopup popup,
                                          @NotNull Ref<Boolean> navigationRef) {
-    IdeDocumentHistory.getInstance(project).gotoPlaceInfo(list.getSelectedValue().getInfo());
+    RecentLocationItem selectedValue = list.getSelectedValue();
+    if (selectedValue != null) {
+      IdeDocumentHistory.getInstance(project).gotoPlaceInfo(selectedValue.getInfo());
+    }
 
     navigationRef.set(true);
     popup.closeOk(null);