diff --git a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
index 058e446bc896..59692f81c790 100644
--- a/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
+++ b/platform/platform-resources-en/src/messages/XDebuggerBundle.properties
@@ -123,3 +123,4 @@ setting.sort.alphabetically.label=Sort a&lphabetically
 
 setting.hide.window.label=Hide debug &window on process termination
 setting.focus.app.on.breakpoint.label=Focus application on breakpoint
+settings.show.window.label=Show &debug window on breakpoint
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
index a3fa4327a7fd..08538a2de6e7 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
@@ -709,7 +709,9 @@ public class XDebugSessionImpl implements XDebugSession {
       @Override
       public void run() {
         if (mySessionTab != null) {
-          mySessionTab.toFront(true);
+          if (XDebuggerSettingsManager.getInstanceImpl().getGeneralSettings().isShowDebuggerOnBreakpoint()) {
+            mySessionTab.toFront(true);
+          }
           mySessionTab.getUi().attractBy(XDebuggerUIConstants.LAYOUT_VIEW_BREAKPOINT_CONDITION);
         }
       }
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.form b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.form
index 4d1f8e52d24f..1260cb3ff44a 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.form
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.xdebugger.impl.settings.GeneralConfigurableUi">
-  <grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="20" y="20" width="500" height="400"/>
@@ -10,7 +10,7 @@
     <children>
       <component id="4b50" class="javax.swing.JCheckBox" binding="hideDebugWindowCheckBox">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text resource-bundle="messages/XDebuggerBundle" key="setting.hide.window.label"/>
@@ -18,7 +18,7 @@
       </component>
       <vspacer id="8e2ed">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="fc652" class="javax.swing.JCheckBox" binding="focusApplicationOnBreakpointCheckBox" default-binding="true">
@@ -29,6 +29,14 @@
           <text resource-bundle="messages/XDebuggerBundle" key="setting.focus.app.on.breakpoint.label"/>
         </properties>
       </component>
+      <component id="4c3e" class="javax.swing.JCheckBox" binding="myShowDebugWindowOnCheckBox" default-binding="true">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="messages/XDebuggerBundle" key="settings.show.window.label"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.java
index 273c5490e35d..bab2c88465ad 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/GeneralConfigurableUi.java
@@ -25,23 +25,27 @@ class GeneralConfigurableUi implements ConfigurableUi<XDebuggerGeneralSettings>
   private JPanel rootPanel;
   private JCheckBox hideDebugWindowCheckBox;
   private JCheckBox focusApplicationOnBreakpointCheckBox;
+  private JCheckBox myShowDebugWindowOnCheckBox;
 
   @Override
   public void reset(@NotNull XDebuggerGeneralSettings settings) {
     focusApplicationOnBreakpointCheckBox.setSelected(Registry.is("debugger.mayBringFrameToFrontOnBreakpoint"));
     hideDebugWindowCheckBox.setSelected(settings.isHideDebuggerOnProcessTermination());
+    myShowDebugWindowOnCheckBox.setSelected(settings.isShowDebuggerOnBreakpoint());
   }
 
   @Override
   public boolean isModified(@NotNull XDebuggerGeneralSettings settings) {
     return focusApplicationOnBreakpointCheckBox.isSelected() != Registry.is("debugger.mayBringFrameToFrontOnBreakpoint") ||
-           hideDebugWindowCheckBox.isSelected() != settings.isHideDebuggerOnProcessTermination();
+           hideDebugWindowCheckBox.isSelected() != settings.isHideDebuggerOnProcessTermination() ||
+           myShowDebugWindowOnCheckBox.isSelected() != settings.isShowDebuggerOnBreakpoint();
   }
 
   @Override
   public void apply(@NotNull XDebuggerGeneralSettings settings) {
     Registry.get("debugger.mayBringFrameToFrontOnBreakpoint").setValue(focusApplicationOnBreakpointCheckBox.isSelected());
     settings.setHideDebuggerOnProcessTermination(hideDebugWindowCheckBox.isSelected());
+    settings.setShowDebuggerOnBreakpoint(myShowDebugWindowOnCheckBox.isSelected());
   }
 
   @NotNull
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java
index 9720d9517c51..205c1c3948ed 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/XDebuggerGeneralSettings.java
@@ -27,6 +27,7 @@ public class XDebuggerGeneralSettings {
   private boolean myUnmuteOnStop = false;
 
   private boolean hideDebuggerOnProcessTermination;
+  private boolean myShowDebuggerOnBreakpoint = true;
 
   @Tag("evaluation-dialog-mode")
   public EvaluationMode getEvaluationDialogMode() {
@@ -53,4 +54,12 @@ public class XDebuggerGeneralSettings {
   public void setHideDebuggerOnProcessTermination(boolean hideDebuggerOnProcessTermination) {
     this.hideDebuggerOnProcessTermination = hideDebuggerOnProcessTermination;
   }
+
+  public boolean isShowDebuggerOnBreakpoint() {
+    return myShowDebuggerOnBreakpoint;
+  }
+
+  public void setShowDebuggerOnBreakpoint(boolean showDebuggerOnBreakpoint) {
+    this.myShowDebuggerOnBreakpoint = showDebuggerOnBreakpoint;
+  }
 }