diff --git a/platform/platform-api/src/com/intellij/ui/AddRemoveUpDownPanel.java b/platform/platform-api/src/com/intellij/ui/AddRemoveUpDownPanel.java
index e2d26d091668..cf0a2a7d3d64 100644
--- a/platform/platform-api/src/com/intellij/ui/AddRemoveUpDownPanel.java
+++ b/platform/platform-api/src/com/intellij/ui/AddRemoveUpDownPanel.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.ui.VerticalFlowLayout;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.util.HashMap;
@@ -75,7 +76,7 @@ public class AddRemoveUpDownPanel extends JPanel {
   }
 
   private Map<Buttons, TableActionButton> myButtons = new HashMap<Buttons, TableActionButton>();
-  public AddRemoveUpDownPanel(Listener listener, Buttons...buttons) {
+  public AddRemoveUpDownPanel(Listener listener, @Nullable JComponent contentPane, Buttons... buttons) {
     super(new VerticalFlowLayout(VerticalFlowLayout.TOP));
     AnAction[] actions = new AnAction[buttons.length];
     for (int i = 0; i < buttons.length; i++) {
@@ -83,6 +84,10 @@ public class AddRemoveUpDownPanel extends JPanel {
       final TableActionButton b = button.createButton(listener);
       actions[i] = b;
       myButtons.put(button, b);
+      final Shortcut shortcut = b.getShortcut();
+      if (contentPane != null && shortcut != null) {
+        b.registerCustomShortcutSet(new CustomShortcutSet(shortcut), contentPane);
+      }
     }
     add(ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, new DefaultActionGroup(actions), false).getComponent());
   }
@@ -94,11 +99,11 @@ public class AddRemoveUpDownPanel extends JPanel {
     }
   }
 
-  public AddRemoveUpDownPanel(Listener listener) {
-    this(listener, Buttons.ADD, Buttons.REMOVE, Buttons.UP, Buttons.DOWN);
+  public AddRemoveUpDownPanel(Listener listener, @Nullable JComponent contentPane) {
+    this(listener, contentPane, Buttons.ADD, Buttons.REMOVE, Buttons.UP, Buttons.DOWN);
   }
 
-  static class TableActionButton extends AnAction {
+  static class TableActionButton extends AnAction implements ShortcutProvider {
     private boolean enabled = true;
     private final Buttons myButton;
     private final Listener myListener;
@@ -122,5 +127,16 @@ public class AddRemoveUpDownPanel extends JPanel {
     public void setEnabled(boolean enabled) {
       this.enabled = enabled;
     }
+
+    @Override
+    public Shortcut getShortcut() {
+      switch (myButton) {
+        case ADD: return KeyboardShortcut.fromString("alt A");
+        case REMOVE: return KeyboardShortcut.fromString("alt DELETE");
+        case UP: return KeyboardShortcut.fromString("alt UP");
+        case DOWN: return KeyboardShortcut.fromString("alt DOWN");
+      }
+      return null;
+    }
   }
 }
diff --git a/platform/platform-api/src/com/intellij/ui/EditableRowTable.java b/platform/platform-api/src/com/intellij/ui/EditableRowTable.java
index 8d7dde91e8ed..0c01fdaea960 100644
--- a/platform/platform-api/src/com/intellij/ui/EditableRowTable.java
+++ b/platform/platform-api/src/com/intellij/ui/EditableRowTable.java
@@ -158,7 +158,7 @@ public class EditableRowTable {
       gbConstraints.weighty = 1;
       panel.add(new JPanel(), gbConstraints);
     } else {
-      p.set(new AddRemoveUpDownPanel(listener));
+      p.set(new AddRemoveUpDownPanel(listener, table));
       panel.add(p.get(), BorderLayout.NORTH);
     }