diff --git a/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java b/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java
index 827a4699caec..09f096ad1421 100644
--- a/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java
+++ b/source/com/intellij/ide/favoritesTreeView/FavoritesViewImpl.java
@@ -171,6 +171,8 @@ public class FavoritesViewImpl extends ContentManagerImpl implements ProjectComp
       favoritesTreeViewPanel.getFavoritesTreeStructure().writeExternal(el);
       element.addContent(el);
     }
-    element.setAttribute("current", myCurrentFavoritesList);
+    if (myCurrentFavoritesList != null) {
+      element.setAttribute("current", myCurrentFavoritesList);
+    }
   }
 }