diff --git a/scheme/nuit-engine.scm b/scheme/nuit-engine.scm
index 558832e..7b68c23 100644
--- a/scheme/nuit-engine.scm
+++ b/scheme/nuit-engine.scm
@@ -1,5 +1,3 @@
-(define initial-command-mode 'command)
-
 (define-syntax when
   (syntax-rules ()
     ((_ ?test ?do-this ...)
@@ -29,7 +27,9 @@
 (define-option 'main 'switch-command-buffer-mode-key key-f7)
 
 ;; mode of the command buffer
-(define *command-buffer-mode* initial-command-mode)
+(define-option 'main 'initial-command-mode 'command)
+
+(define *command-buffer-mode*)
 
 (define (command-buffer-in-scheme-mode?)
   (eq? *command-buffer-mode* 'scheme))
@@ -321,7 +321,8 @@
   (init-screen)
   (init-windows!)
   (read-config-file!)
-
+  (set! *command-buffer-mode* (config 'main 'initial-command-mode))
+  
   (clear)
 
   (if (not (process-group-leader?))