diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java
index 757610b1e42b..d6c9025e8b90 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerHistoryManager.java
@@ -51,7 +51,7 @@ public class XDebuggerHistoryManager {
       list.removeLast();
     }
 
-    XExpression trimmedExpression = new XExpressionImpl(expression.getExpression().trim(), expression.getLanguage(), expression.getCustomInfo());
+    XExpression trimmedExpression = new XExpressionImpl(expression.getExpression().trim(), expression.getLanguage(), expression.getCustomInfo(), expression.getMode());
     list.remove(trimmedExpression);
     list.addFirst(trimmedExpression);
     return true;
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
index 5928d8babf16..05d56161bade 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerEditorBase.java
@@ -240,7 +240,7 @@ public abstract class XDebuggerEditorBase {
     final List<XExpression> expressions = getRecentExpressions();
     if (myHistoryIndex < expressions.size() - 1) {
       myHistoryIndex++;
-      setEditorText(expressions.get(myHistoryIndex));
+      setExpression(expressions.get(myHistoryIndex));
     }
   }
 
@@ -248,7 +248,7 @@ public abstract class XDebuggerEditorBase {
     final List<XExpression> expressions = getRecentExpressions();
     if (myHistoryIndex > 0) {
       myHistoryIndex--;
-      setEditorText(expressions.get(myHistoryIndex));
+      setExpression(expressions.get(myHistoryIndex));
     }
   }
 }