diff --git a/init.zsh b/init.zsh
index 172b52c..eff22cb 100755
--- a/init.zsh
+++ b/init.zsh
@@ -14,10 +14,12 @@ fi
 # Source user configuration
 [[ -s ${ZDOTDIR:-${HOME}}/.zimrc ]] && source ${ZDOTDIR:-${HOME}}/.zimrc
 
-if zinput_mode='emacs'; then
-  set -o emacs
-else
+# If necessary, set vi mode before loading modules
+if zinput_mode='vi'; then
   set -o vi
+else
+  set -o emacs
+fi
 
 # Autoload module functions
 () {
diff --git a/templates/zimrc b/templates/zimrc
index e6cba01..ad47dbd 100644
--- a/templates/zimrc
+++ b/templates/zimrc
@@ -12,7 +12,7 @@
 # The second line of modules may depend on options set by modules in the first
 # line. These dependencies are noted on the respective module's README.md.
 zmodules=(directory environment git git-info history input utility custom \
-          syntax-highlighting history-substring-search prompt completion)
+          syntax-highlighting prompt completion history-substring-search)
 
 
 ###################