diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 14fb27d..af23262 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -225,6 +225,7 @@
 
 (define (handle-return-key)
   (let ((command-line (cadr (reverse (buffer-text command-buffer)))))
+    (debug-message "command-line " command-line)
     (cond
      ((string=? command-line "")
       (values))
@@ -255,7 +256,9 @@
 	 (new-entry
 	  (make-history-entry command args viewer)))
     ;; FIXME, use insert here
-    (append-to-history! new-entry)))
+    (append-to-history! new-entry)
+    (paint-result-window new-entry)
+    (refresh-result-window)))
 
 (define (eval-command-in-scheme-mode command-line)
   (let ((viewer
@@ -267,7 +270,9 @@
 	   (new-entry
 	    (make-history-entry command args viewer)))
       ;; #### shouldn't we use some kind of insertion here?
-      (append-to-history! new-entry))))
+      (append-to-history! new-entry)
+      (paint-result-window new-entry)
+      (refresh-result-window))))
 
 ;; #### crufty
 (define split-command-line string-tokenize)
@@ -293,8 +298,6 @@
   (let loop ((ch (wait-for-input)) (c-x-pressed? #f)
 	     (completion-selector #f))
 
-    (debug-message "command-buffer " command-buffer)
-    
     (cond
 
      ;; Ctrl-x -> wait for next input
@@ -320,7 +323,7 @@
 	(loop (wait-for-input) #f maybe-selector)))
 
      ;; F7 toggle scheme-mode / command-mode (FIXME: find a better key)
-     ((= ch key-home)
+     ((= ch key-f7)
       (toggle-command/scheme-mode)
       (loop (wait-for-input) #f #f))