diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java
index ff129978776d..bc0a655b3a75 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java
@@ -70,7 +70,7 @@ public class AddToFavoritesAction extends AnAction {
   public static Collection<AbstractTreeNode> getNodesToAdd(final DataContext dataContext, final boolean inProjectView) {
     Project project = PlatformDataKeys.PROJECT.getData(dataContext);
 
-    if (project == null) return null;
+    if (project == null) return Collections.emptyList();
 
     Module moduleContext = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
 
diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesActionGroup.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesActionGroup.java
index da542927fd27..c10a4d5ec25e 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesActionGroup.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesActionGroup.java
@@ -19,6 +19,7 @@ package com.intellij.ide.favoritesTreeView.actions;
 import com.intellij.ide.favoritesTreeView.FavoritesManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -27,6 +28,7 @@ import org.jetbrains.annotations.Nullable;
  */
 public class AddToFavoritesActionGroup extends ActionGroup {
 
+  @NotNull
   public AnAction[] getChildren(@Nullable AnActionEvent e) {
     if (e == null) return AnAction.EMPTY_ARRAY;
     final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
@@ -34,7 +36,6 @@ public class AddToFavoritesActionGroup extends ActionGroup {
       return AnAction.EMPTY_ARRAY;
     }
     final String[] availableFavoritesLists = FavoritesManager.getInstance(project).getAvailableFavoritesLists();
-    if (availableFavoritesLists == null) return AnAction.EMPTY_ARRAY;
     AnAction[] actions = new AnAction[availableFavoritesLists.length + 2];
     int idx = 0;
     for (String favoritesList : availableFavoritesLists) {
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index abcbcebc27a5..ab6672be5f61 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -486,6 +486,7 @@
       <action id="RemoveFromFavorites" class="com.intellij.ide.favoritesTreeView.actions.DeleteFromFavoritesAction"/>
       <action id="RemoveFavoritesList" class="com.intellij.ide.favoritesTreeView.actions.DeleteFavoritesListAction"/>
       <action id="RemoveAllFavoritesListsButThis" class="com.intellij.ide.favoritesTreeView.actions.DeleteAllFavoritesListsButThisAction"/>
+      <reference ref="AddToFavorites"/>
       <reference ref="SendToFavoritesGroup"/>
       <reference ref="MoveToChangeList"/>
       <separator/>