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 27b426af12ee..4d410ce5b29d 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
@@ -142,7 +142,9 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> implement
       final String text = myConditionComboBox.getText();
       final String condition = StringUtil.isEmptyOrSpaces(text) ? null : text;
       myBreakpoint.setCondition(condition);
-      myConditionComboBox.saveTextInHistory();
+      if (condition != null) {
+        myConditionComboBox.saveTextInHistory();
+      }
     }
 
     for (XBreakpointCustomPropertiesPanel<B> customPanel : myCustomPanels) {