diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
index 61b6ee393d99..78943a98b248 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -297,6 +297,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
 
   private void setPromptInner(final String prompt) {
     ((EditorImpl)myConsoleEditor).setPrefixTextAndAttributes(prompt, ConsoleViewContentType.USER_INPUT.getAttributes());
+    myConsoleEditor.getCaretModel().moveToOffset(myConsoleEditor.getDocument().getTextLength());
     if (myPanel.isVisible()) {
       queueUiUpdate(false);
     }