diff --git a/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java b/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java
index 98f79a623b7f..58bb0148b255 100644
--- a/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java
+++ b/platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java
@@ -20,78 +20,60 @@
  */
 package com.intellij.execution;
 
+import com.intellij.CommonBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.util.ui.UIUtil;
+import com.intellij.openapi.ui.Messages;
 
-import javax.swing.*;
-import javax.swing.border.Border;
-import java.awt.*;
-
-public class TerminateRemoteProcessDialog extends DialogWrapper {
-  private static final int ICON_TEXT_GAP = 7;
-  private JCheckBox myTerminateCheckBox;
-  private final String mySessionName;
-  private final boolean myDetachIsDefault;
-  private final boolean myAlwaysUseDefault;
-
-  public TerminateRemoteProcessDialog(final Project project,
-                                      final String configurationName,
-                                      final boolean detachIsDefault,
-                                      boolean alwaysUseDefault) {
-    super(project, true);
-    mySessionName = configurationName;
-    myDetachIsDefault = detachIsDefault;
-    myAlwaysUseDefault = alwaysUseDefault;
-    setTitle(ExecutionBundle.message("process.is.running.dialog.title", mySessionName));
-    setOKButtonText(alwaysUseDefault && !detachIsDefault ? ExecutionBundle.message("button.terminate")
-                                                         : ExecutionBundle.message("button.disconnect"));
-    setButtonsAlignment(SwingUtilities.CENTER);
-    this.init();
+public class TerminateRemoteProcessDialog {
+  public static int show(final Project project,
+                         final String sessionName,
+                         final TerminateOption option) {
+    final String message = option.myAlwaysUseDefault && !option.myDetachIsDefault ?
+                           ExecutionBundle.message("terminate.process.confirmation.text", sessionName) :
+                           ExecutionBundle.message("disconnect.process.confirmation.text", sessionName);
+    final String okButtonText = option.myAlwaysUseDefault && !option.myDetachIsDefault ?
+                                ExecutionBundle.message("button.terminate") :
+                                ExecutionBundle.message("button.disconnect");
+    final String[] options = new String[] {okButtonText, CommonBundle.getCancelButtonText()};
+    return Messages.showDialog(project, message, ExecutionBundle.message("process.is.running.dialog.title", sessionName),
+                        options, 0, Messages.getWarningIcon(),
+                        option);
   }
 
-  protected Action[] createActions(){
-    return new Action[]{getOKAction(), getCancelAction()};
-  }
+  public static class TerminateOption implements DialogWrapper.DoNotAskOption {
+    private final boolean myDetachIsDefault;
+    private final boolean myAlwaysUseDefault;
+    private boolean myDontTerminate = false;
 
-  protected JComponent createNorthPanel() {
-    final String message = myAlwaysUseDefault && !myDetachIsDefault ?
-                           ExecutionBundle.message("terminate.process.confirmation.text", mySessionName) :
-                           ExecutionBundle.message("disconnect.process.confirmation.text", mySessionName);
-    final JLabel label = new JLabel(message);
-    final JPanel panel = new JPanel(new BorderLayout());
-    panel.add(label, BorderLayout.CENTER);
-    final Icon icon = UIUtil.getOptionPanelWarningIcon();
-    if (icon != null) {
-      label.setIcon(icon);
-      label.setIconTextGap(ICON_TEXT_GAP);
+    public TerminateOption(boolean detachIsDefault, boolean alwaysUseDefault) {
+      myDetachIsDefault = detachIsDefault;
+      myAlwaysUseDefault = alwaysUseDefault;
     }
-    return panel;
-  }
 
-  protected JComponent createCenterPanel() {
-    final JPanel panel = new JPanel(new BorderLayout());
-    if (!myAlwaysUseDefault) {
-      myTerminateCheckBox = new JCheckBox(ExecutionBundle.message("terminate.after.disconnect.checkbox"));
-      myTerminateCheckBox.setSelected(!myDetachIsDefault);
-      final Icon icon = UIUtil.getOptionPanelWarningIcon();
-      if (icon != null) {
-        final Border border = myTerminateCheckBox.getBorder();
-        if (border != null) {
-          final Insets insets = border.getBorderInsets(myTerminateCheckBox);
-          final Border emptyBorder = BorderFactory.createEmptyBorder(0, icon.getIconWidth()+ICON_TEXT_GAP-insets.left, 0, 0);
-          myTerminateCheckBox.setBorder(BorderFactory.createCompoundBorder(emptyBorder, border));
-        }
-        else {
-          myTerminateCheckBox.setBorder(BorderFactory.createEmptyBorder(0, icon.getIconWidth()+ICON_TEXT_GAP, 0, 0));
-        }
-      }
-      panel.add(myTerminateCheckBox, BorderLayout.WEST);
+    @Override
+    public boolean isToBeShown() {
+      return myAlwaysUseDefault ? !myDetachIsDefault : myDontTerminate;
     }
-    return panel;
-  }
 
-  public boolean forceTermination() {
-    return myAlwaysUseDefault ? !myDetachIsDefault : myTerminateCheckBox.isSelected();
+    @Override
+    public void setToBeShown(boolean value, int exitCode) {
+      myDontTerminate = value;
+    }
+
+    @Override
+    public boolean canBeHidden() {
+      return !myAlwaysUseDefault;
+    }
+
+    @Override
+    public boolean shouldSaveOptionsOnCancel() {
+      return false;
+    }
+
+    @Override
+    public String getDoNotShowMessage() {
+      return ExecutionBundle.message("terminate.after.disconnect.checkbox");
+    }
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
index a9db26f1d957..3eabbebd9db1 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
@@ -48,7 +48,6 @@ import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.ui.content.*;
-import com.intellij.ui.content.impl.ContentImpl;
 import com.intellij.ui.docking.DockManager;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.containers.ContainerUtil;
@@ -616,12 +615,10 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
       else {
         //todo[nik] this is a temporary solution for the following problem: some configurations should not allow user to choose between 'terminating' and 'detaching'
         final boolean useDefault = Boolean.TRUE.equals(processHandler.getUserData(ALWAYS_USE_DEFAULT_STOPPING_BEHAVIOUR_KEY));
-        final TerminateRemoteProcessDialog terminateDialog = new TerminateRemoteProcessDialog(myProject, descriptor.getDisplayName(),
-                                                                                              processHandler.detachIsDefault(),
-                                                                                              useDefault);
-        terminateDialog.show();
-        if (terminateDialog.getExitCode() != DialogWrapper.OK_EXIT_CODE) return false;
-        destroyProcess = terminateDialog.forceTermination();
+        final TerminateRemoteProcessDialog.TerminateOption option = new TerminateRemoteProcessDialog.TerminateOption(processHandler.detachIsDefault(), useDefault);
+        final int rc = TerminateRemoteProcessDialog.show(myProject, descriptor.getDisplayName(), option);
+        if (rc != DialogWrapper.OK_EXIT_CODE) return false;
+        destroyProcess = !option.isToBeShown();
       }
       if (destroyProcess) {
         processHandler.destroyProcess();