1 files changed, 3 insertions, 2 deletions
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
index 9f869ac25def..0e847d7db05d 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XLightBreakpointPropertiesPanel.java
@@ -206,9 +206,10 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpointBase<?,?,?>> i
     }
 
     if (myConditionComboBox != null) {
-      myBreakpoint.setConditionEnabled(myConditionEnabledCheckbox.isSelected());
       XExpression expression = myConditionComboBox.getExpression();
-      myBreakpoint.setConditionExpression(!XDebuggerUtilImpl.isEmptyExpression(expression) ? expression : null);
+      XExpression condition = !XDebuggerUtilImpl.isEmptyExpression(expression) ? expression : null;
+      myBreakpoint.setConditionEnabled(myConditionEnabledCheckbox.isSelected() && condition != null);
+      myBreakpoint.setConditionExpression(condition);
       myConditionComboBox.saveTextInHistory();
     }