diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index af23262..0896701 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -258,7 +258,9 @@
     ;; FIXME, use insert here
     (append-to-history! new-entry)
     (paint-result-window new-entry)
-    (refresh-result-window)))
+    (refresh-result-window)
+    (move-cursor command-buffer result-buffer)
+    (refresh-command-window)))
 
 (define (eval-command-in-scheme-mode command-line)
   (let ((viewer