diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 0ba3ed8..ba0b134 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -87,7 +87,10 @@
   (cond
    ((current-history-item)
     => (lambda (entry)
-	 (set-history-entry-viewer! (entry-data entry) new-viewer)))
+	 (if (not (eq? (history-entry-viewer (entry-data entry))
+		       new-viewer))
+	     (append-to-history!
+	      (make-history-entry #f '() new-viewer)))))
    (else (values))))
 
 (define (append-to-history! history-entry)
@@ -680,8 +683,11 @@
       => (lambda (entry)
 	   (mvwaddstr win 1 2 
 		      (maybe-shorten-string 
-		       (history-entry-command (entry-data entry)) width)))))
-    (wrefresh win)))
+		       (if (entry-data entry)
+			   "user interaction"
+			   (history-entry-command (entry-data entry))) 
+		       width)))))
+     (wrefresh win)))
 
 ;;Cursor
 ;;move cursor to the corrct position