diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultConditionComboBoxPanel.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultConditionComboBoxPanel.java
index 9cee406625a7..d7ae72b2ad53 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultConditionComboBoxPanel.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultConditionComboBoxPanel.java
@@ -30,13 +30,14 @@ import javax.swing.*;
  * @author egor
  */
 public class DefaultConditionComboBoxPanel<B extends XBreakpoint<?>> extends XBreakpointCustomPropertiesPanel<B> {
+  public static final String HISTORY_KEY = "breakpointCondition";
+
   private XDebuggerExpressionComboBox myConditionComboBox;
 
   public DefaultConditionComboBoxPanel(Project project,
                                        XDebuggerEditorsProvider debuggerEditorsProvider,
-                                       String historyId,
                                        XSourcePosition sourcePosition) {
-    myConditionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, historyId, sourcePosition);
+    myConditionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, HISTORY_KEY, sourcePosition);
   }
 
   @NotNull
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultLogExpressionComboBoxPanel.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultLogExpressionComboBoxPanel.java
index a4ff954c7375..d8ef28a68a10 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultLogExpressionComboBoxPanel.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/DefaultLogExpressionComboBoxPanel.java
@@ -29,13 +29,14 @@ import javax.swing.*;
  * @author egor
  */
 public class DefaultLogExpressionComboBoxPanel<B extends XBreakpoint<?>> extends XBreakpointCustomPropertiesPanel<B> {
+  public static final String HISTORY_KEY = "breakpointLogExpression";
+
   private XDebuggerExpressionComboBox myLogExpressionComboBox;
 
   public DefaultLogExpressionComboBoxPanel(Project project,
                                            XDebuggerEditorsProvider debuggerEditorsProvider,
-                                           String historyId,
                                            XSourcePosition sourcePosition) {
-    myLogExpressionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, historyId, sourcePosition);
+    myLogExpressionComboBox = new XDebuggerExpressionComboBox(project, debuggerEditorsProvider, HISTORY_KEY, sourcePosition);
   }
 
   @NotNull
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.java
index 2ccff41e5c7e..dbb8b21ee4ce 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/ui/XBreakpointActionsPanel.java
@@ -57,11 +57,11 @@ public class XBreakpointActionsPanel<B extends XBreakpoint<?>> extends XBreakpoi
 
       if (debuggerEditorsProvider instanceof XDebuggerComboBoxProvider) {
         logExpressionPanel = ((XDebuggerComboBoxProvider<B>)debuggerEditorsProvider).createLogExpressionComboBoxPanel(
-          project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
+          project, debuggerEditorsProvider, DefaultLogExpressionComboBoxPanel.HISTORY_KEY, myBreakpoint.getSourcePosition());
       }
       else {
         logExpressionPanel =
-          new DefaultLogExpressionComboBoxPanel<B>(project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
+          new DefaultLogExpressionComboBoxPanel<B>(project, debuggerEditorsProvider, myBreakpoint.getSourcePosition());
       }
 
       JComponent logExpressionComponent = logExpressionPanel.getComponent();
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 7c910835dd63..5fce4783541e 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
@@ -107,11 +107,11 @@ public class XLightBreakpointPropertiesPanel<B extends XBreakpoint<?>> implement
       final XBreakpointCustomPropertiesPanel<B> conditionPanel;
       if (debuggerEditorsProvider instanceof XDebuggerComboBoxProvider) {
         conditionPanel = ((XDebuggerComboBoxProvider<B>)debuggerEditorsProvider).createConditionComboBoxPanel(
-            project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
+            project, debuggerEditorsProvider, DefaultConditionComboBoxPanel.HISTORY_KEY, myBreakpoint.getSourcePosition());
       }
       else {
         conditionPanel =
-          new DefaultConditionComboBoxPanel<B>(project, debuggerEditorsProvider, "breakpointCondition", myBreakpoint.getSourcePosition());
+          new DefaultConditionComboBoxPanel<B>(project, debuggerEditorsProvider, myBreakpoint.getSourcePosition());
       }
       myConditionExpressionPanel.add(conditionPanel.getComponent(), BorderLayout.CENTER);
       myCustomPanels.add(conditionPanel);