diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 247eb63..dbdb3da 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -132,6 +132,7 @@
   (current-history-entry-selector-maker history-entry-result))
 
 (define (update-current-result! new-value)
+  (debug-message "update-current-result! " new-value)
   (cond
    ((current-history-item)
     => (lambda (entry)
@@ -341,7 +342,7 @@
       (refresh-result-window)
       (loop (wait-for-input) c-x-pressed?))
 
-     ((= ch 10)
+     ((and (focus-on-command-buffer?) (= ch 10))
       (handle-return-key)
       (loop (wait-for-input) c-x-pressed?))