diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
index dbd04258b1cd..c97779cd087b 100644
--- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
@@ -215,7 +215,9 @@ public abstract class TodoPanel extends SimpleToolWindowPanel implements Occuren
 
     toolbarGroup.add(new MyPreviewAction());
 
-    setToolbar(ActionManager.getInstance().createActionToolbar(ActionPlaces.TODO_VIEW_TOOLBAR, toolbarGroup, false).getComponent());
+    ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.TODO_VIEW_TOOLBAR, toolbarGroup, false);
+    toolbar.setTargetComponent(myTree);
+    setToolbar(toolbar.getComponent());
   }
 
   @NotNull