diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 9c521e6..e86509d 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -211,6 +211,7 @@
        (append-to-history! new-entry)
        (signal-result-buffer-object-change)
        (obtain-lock paint-lock)
+       (paint-active-command-window)
        (paint-result-window new-entry)
        (refresh-result-window)
        (move-cursor (command-buffer) (result-buffer))
@@ -243,6 +244,7 @@
       (append-to-history! new-entry)
       (signal-result-buffer-object-change)
       (obtain-lock paint-lock)
+      (paint-active-command-window)
       (paint-result-window new-entry)
       (refresh-result-window)
       (move-cursor (command-buffer) (result-buffer))
@@ -265,6 +267,7 @@
              (append-to-history! new-entry)
              (signal-result-buffer-object-change)
              (obtain-lock paint-lock)
+	     (paint-active-command-window)
              (paint-result-window new-entry)
              (refresh-result-window)
              (move-cursor (command-buffer) (result-buffer))
@@ -683,9 +686,9 @@
       => (lambda (entry)
 	   (mvwaddstr win 1 2 
 		      (maybe-shorten-string 
-		       (if (entry-data entry)
-			   "user interaction"
-			   (history-entry-command (entry-data entry))) 
+		       (if (history-entry-command (entry-data entry))
+			   (history-entry-command (entry-data entry))
+			   "user interaction")
 		       width)))))
      (wrefresh win)))