diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
index 2745789a55ff..d0c7cf627dbf 100644
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
@@ -245,16 +245,19 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider, Dock
       @Override
       public void rootsChanged() {
         myBuilder.updateFromRoot();
+        myTree.repaint();
       }
 
       @Override
       public void listAdded(String listName) {
         myBuilder.updateFromRoot();
+        myTree.repaint();
       }
 
       @Override
       public void listRemoved(String listName) {
         myBuilder.updateFromRoot();
+        myTree.repaint();
       }
     });
   }
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index 49facb201cfa..7bfd2960e027 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -827,6 +827,9 @@
     <usageContextPanelProvider implementation="com.intellij.usageView.impl.UsageContextCallHierarchyPanel$Provider"/>
     <fileDocumentSynchronizationVetoer implementation="com.intellij.codeInsight.lookup.impl.LookupDocumentSavingVetoer"/>
     <toolsProvider implementation="com.intellij.tools.LocalToolsProvider"/>
+
+    <favoritesListProvider implementation="com.intellij.ide.bookmarks.BookmarksFavoriteListProvider"/>
+    <favoritesListProvider implementation="com.intellij.xdebugger.impl.breakpoints.BreakpointsFavoriteListProvider"/>
   </extensions>
 </idea-plugin>
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointsFavoriteListProvider.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointsFavoriteListProvider.java
similarity index 97%
rename from java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointsFavoriteListProvider.java
rename to platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointsFavoriteListProvider.java
index f6852bb00ab3..41caa63947c1 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointsFavoriteListProvider.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/BreakpointsFavoriteListProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intellij.debugger.ui.breakpoints;
+package com.intellij.xdebugger.impl.breakpoints;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.favoritesTreeView.AbstractFavoritesListProvider;
@@ -29,9 +29,6 @@ import com.intellij.xdebugger.XDebuggerManager;
 import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroup;
 import com.intellij.xdebugger.breakpoints.ui.XBreakpointGroupingRule;
 import com.intellij.xdebugger.impl.DebuggerSupport;
-import com.intellij.xdebugger.impl.breakpoints.XBreakpointManagerImpl;
-import com.intellij.xdebugger.impl.breakpoints.XBreakpointUtil;
-import com.intellij.xdebugger.impl.breakpoints.XBreakpointsDialogState;
 import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointItem;
 import com.intellij.xdebugger.impl.breakpoints.ui.BreakpointPanelProvider;
 import com.intellij.xdebugger.impl.breakpoints.ui.tree.BreakpointItemsTreeController;
@@ -75,20 +72,12 @@ public class BreakpointsFavoriteListProvider extends AbstractFavoritesListProvid
     myTreeController = new BreakpointItemsTreeController(myRulesAvailable);
     myTree = new BreakpointsSimpleTree(myProject, myTreeController);
     myTreeController.setTreeView(myTree);
+    updateChildren();
   }
 
   @Override
   public void breakpointsChanged() {
-    List<BreakpointItem> items = new ArrayList<BreakpointItem>();
-    for (final BreakpointPanelProvider provider : myBreakpointPanelProviders) {
-      provider.provideBreakpointItems(myProject, items);
-    }
-    getEnabledGroupingRules(myRulesEnabled);
-    myTreeController.setGroupingRules(myRulesEnabled);
-    myTreeController.rebuildTree(items);
-
     updateChildren();
-    FavoritesManager.getInstance(myProject).fireListeners(getListName(myProject));
   }
 
   private void getEnabledGroupingRules(Collection<XBreakpointGroupingRule> rules) {
@@ -103,7 +92,16 @@ public class BreakpointsFavoriteListProvider extends AbstractFavoritesListProvid
   }
 
   private void updateChildren() {
+    List<BreakpointItem> items = new ArrayList<BreakpointItem>();
+    for (final BreakpointPanelProvider provider : myBreakpointPanelProviders) {
+      provider.provideBreakpointItems(myProject, items);
+    }
+    getEnabledGroupingRules(myRulesEnabled);
+    myTreeController.setGroupingRules(myRulesEnabled);
+    myTreeController.rebuildTree(items);
+
     myChildren.clear();
+
     CheckedTreeNode root = myTreeController.getRoot();
     for (int i = 0; i < root.getChildCount(); i++) {
       TreeNode child = root.getChildAt(i);
@@ -111,6 +109,7 @@ public class BreakpointsFavoriteListProvider extends AbstractFavoritesListProvid
         replicate((DefaultMutableTreeNode)child, myNode, myChildren);
       }
     }
+    FavoritesManager.getInstance(myProject).fireListeners(getListName(myProject));
   }
 
   private void replicate(DefaultMutableTreeNode source, AbstractTreeNode destination, final List<AbstractTreeNode<Object>> destinationChildren) {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointPanelProvider.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointPanelProvider.java
index 0dfc420586d3..c3f153f23063 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointPanelProvider.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointPanelProvider.java
@@ -148,6 +148,7 @@ public class XBreakpointPanelProvider extends BreakpointPanelProvider<XBreakpoin
 
     @Override
     public void breakpointChanged(@NotNull XBreakpoint<?> breakpoint) {
+      myListener.breakpointsChanged();
     }
   }
 
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 16ffa42d2855..e1254dc9e581 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -1125,10 +1125,6 @@
     <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiMethodFavoriteNodeProvider"/>
     <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.PsiPackageFavoriteNodeProvider"/>
     <favoriteNodeProvider implementation="com.intellij.ide.favoritesTreeView.UsageFavoriteNodeProvider"/>
-    <!-- <favoritesListProvider implementation="com.intellij.ide.favoritesTreeView.ProjectDefaultFavoriteListProvider"/> -->
-    <!-- <favoritesListProvider implementation="com.intellij.ide.favoritesTreeView.TaskDefaultFavoriteListProvider"/> -->
-    <favoritesListProvider implementation="com.intellij.ide.bookmarks.BookmarksFavoriteListProvider"/>
-    <favoritesListProvider implementation="com.intellij.debugger.ui.breakpoints.BreakpointsFavoriteListProvider"/>
 
     <configurationType implementation="com.intellij.execution.applet.AppletConfigurationType"/>
     <configurationProducer implementation="com.intellij.execution.applet.AppletConfigurationProducer"/>