diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
index 8a55c94dd1f9..7ac9881f335a 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
@@ -281,7 +281,9 @@ public abstract class AbstractConsoleRunnerWithHistory {
       public boolean process(final AnActionEvent e, final String s) {
         new WriteCommandAction(languageConsole.getProject(), languageConsole.getFile()) {
           protected void run(final Result result) throws Throwable {
-            languageConsole.getEditorDocument().setText(s == null ? "" : s);
+            String text = s == null ? "" : s;
+            languageConsole.getEditorDocument().setText(text);
+            languageConsole.getConsoleEditor().getCaretModel().moveToOffset(text.length());
           }
         }.execute();
         return true;