diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java
index 15a95aa41bbd..2c1844fd7e69 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapUIImpl.java
@@ -179,7 +179,7 @@ public class HotSwapUIImpl extends HotSwapUI implements ProjectComponent{
                     @Override
                     public Integer fun(Integer exitCode, JCheckBox cb) {
                       settings.HOTSWAP_HANG_WARNING_ENABLED = !cb.isSelected();
-                      return exitCode;
+                      return exitCode == DialogWrapper.OK_EXIT_CODE? exitCode : DialogWrapper.CANCEL_EXIT_CODE;
                     }
                   }
                 );