diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java
index 6d3da857c83c..d91c8693028f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/MultiplePasteAction.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.ide.CopyPasteManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.openapi.ui.OptionAction;
 import com.intellij.ui.UIBundle;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -125,7 +124,14 @@ public class MultiplePasteAction extends AnAction implements DumbAware {
 
     public ClipboardContentChooser(Project project) {
       super(project, UIBundle.message("choose.content.to.paste.dialog.title"), true, true);
-      setOKButtonText(UIBundle.message("choose.content.to.paste.dialog.ok.button"));
+      setOKButtonText(ActionsBundle.actionText(IdeActions.ACTION_EDITOR_PASTE));
+      setOKButtonMnemonic('P');
+    }
+
+    @NotNull
+    @Override
+    protected Action[] createActions() {
+      return new Action[]{getHelpAction(), getOKAction(), new PasteSimpleAction(), getCancelAction()};
     }
 
     @Nullable
@@ -156,22 +162,6 @@ public class MultiplePasteAction extends AnAction implements DumbAware {
       CopyPasteManagerEx.getInstanceEx().removeContent(content);
     }
 
-    @Override
-    protected void createDefaultActions() {
-      super.createDefaultActions();
-      myOKAction = new PasteAction();
-    }
-
-    class PasteAction extends OkAction implements OptionAction {
-      private final Action[] myActions = new Action[] {new PasteSimpleAction()};
-        
-      @NotNull
-      @Override
-      public Action[] getOptions() {
-        return myActions;
-      }
-    }
-
     class PasteSimpleAction extends DialogWrapperAction {
       private PasteSimpleAction() {
         super(ActionsBundle.actionText(IdeActions.ACTION_EDITOR_PASTE_SIMPLE));
diff --git a/platform/platform-resources-en/src/messages/UIBundle.properties b/platform/platform-resources-en/src/messages/UIBundle.properties
index f2dd20f294d8..57f1a81ac167 100644
--- a/platform/platform-resources-en/src/messages/UIBundle.properties
+++ b/platform/platform-resources-en/src/messages/UIBundle.properties
@@ -133,7 +133,6 @@ cannot.save.files.dialog.revert.changes=&Revert Changes
 cannot.save.files.dialog.ignore.changes=&Ignore Changes
 status.bar.column.status.text=Column
 choose.content.to.paste.dialog.title=Choose Content to Paste
-choose.content.to.paste.dialog.ok.button=Paste
 
 downloading.file.try.again.button=Tr&y Again
 downloading.file.change.http.proxy.settings=Change HTTP &Proxy Settings...