diff --git a/js/console.js b/js/console.js
index 7601768ec6..433337c336 100644
--- a/js/console.js
+++ b/js/console.js
@@ -582,6 +582,9 @@ var PMA_consoleInput = {
             if (queryString !== false) {
                 PMA_consoleInput._historyCount = nextCount;
                 PMA_consoleInput.setText(queryString, 'console');
+                if (PMA_consoleInput._codemirror) {
+                    editor.setCursor(editor.lineCount(), 0);
+                }
                 event.preventDefault();
             }
         }