diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 5ea0110..b2a3922 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -355,6 +355,7 @@
 
      ;; tab is pressed in the first place, offer completions
      ((and (focus-on-command-buffer?)
+	   (command-buffer-in-command-mode?)
 	   (= ch key-tab))
       (let ((maybe-selector
 	     (offer-completions (last (buffer-text (command-buffer))))))