diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java
index 4b2f1d58b893..82df8a529d21 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/AbstractTableView.java
@@ -128,7 +128,7 @@ public abstract class AbstractTableView<T> extends JPanel implements TypeSafeDat
     final ActionManager actionManager = ActionManager.getInstance();
     final ToolbarPosition position = getToolbarPosition();
     final ActionToolbar myActionToolbar = actionManager.createActionToolbar(ActionPlaces.PROJECT_VIEW_TOOLBAR, actionGroup, position == ToolbarPosition.TOP || position == ToolbarPosition.BOTTOM);
-    myActionToolbar.setTargetComponent(myTable);
+    myActionToolbar.setTargetComponent(myInnerPanel);
     final JComponent toolbarComponent = myActionToolbar.getComponent();
     final MatteBorder matteBorder = BorderFactory.createMatteBorder(0, 0, position == ToolbarPosition.TOP ? 1 : 0, 0, JBColor.DARK_GRAY);
     toolbarComponent.setBorder(BorderFactory.createCompoundBorder(matteBorder, toolbarComponent.getBorder()));
diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java
index e41204fc20b7..ba69ab5992b9 100644
--- a/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java
+++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/DomCollectionControl.java
@@ -167,7 +167,9 @@ public class DomCollectionControl<T extends DomElement> extends DomUIControl imp
   }
 
   protected DefaultActionGroup createPopupActionGroup() {
-    return (DefaultActionGroup)ActionManager.getInstance().getAction("DomCollectionControl");
+    final DefaultActionGroup group = new DefaultActionGroup();
+    group.addAll((DefaultActionGroup)ActionManager.getInstance().getAction("DomCollectionControl"));
+    return group;
   }
 
   protected ColumnInfo[] createColumnInfos(DomElement parent) {