diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
index 408dc1aeb04e..a7b88f3b98c3 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerExpressionComboBox.java
@@ -229,6 +229,8 @@ public class DebuggerExpressionComboBox extends DebuggerEditorImpl {
         final EditorTextField textField = (EditorTextField)editorComponent;
         final Editor editor = textField.getEditor();
         if (editor != null) {
+          int textLength = editor.getDocument().getTextLength();
+          offset = Math.min(offset, textLength);
           textField.getCaretModel().moveToOffset(offset);
           editor.getSelectionModel().setSelection(offset, offset);
         }