diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java
index a1fef7a2a543..fb378f765933 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java
@@ -22,7 +22,9 @@ import com.intellij.debugger.engine.evaluation.TextWithImports;
 import com.intellij.debugger.engine.evaluation.TextWithImportsImpl;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
@@ -49,17 +51,14 @@ public class DebuggerStatementEditor extends DebuggerEditorImpl {
   public DebuggerStatementEditor(Project project, PsiElement context, @NonNls String recentsId, final CodeFragmentFactory factory) {
     super(project, context, recentsId, factory);
     myRecentIdx = getRecentItemsCount();
-    myEditor = new EditorTextField("", project, factory.getFileType()) {
+    final Document document = EditorFactory.getInstance().createDocument("");
+    myEditor = new EditorTextField(document, project, factory.getFileType(), false, false) {
       protected EditorEx createEditor() {
         EditorEx editor = super.createEditor();
         editor.setVerticalScrollbarVisible(true);
+        editor.setHorizontalScrollbarVisible(true);
         return editor;
       }
-
-      @Override
-      protected boolean isOneLineMode() {
-        return false;
-      }
     };
 
     setLayout(new BorderLayout());
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
index 6a404635be15..bb0b21c68877 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/BreakpointPropertiesPanel.java
@@ -252,7 +252,7 @@ public abstract class BreakpointPropertiesPanel {
     myConditionMagnifierButton = new FixedSizeButton(myConditionCombo);
     conditionPanel.add(myConditionMagnifierButton, BorderLayout.EAST);
     myConditionMagnifierButton.setFocusable(false);
-    myConditionMagnifierButton.addActionListener(new MagnifierButtonAction(project, myConditionCombo, myConditionCheckbox.getText()));
+    myConditionMagnifierButton.addActionListener(new MagnifierButtonAction(project, myConditionCombo, "Condition"));
 
     insert(myConditionComboPanel, conditionPanel);
     insert(myLogExpressionComboPanel, myLogExpressionCombo);