diff --git a/lib/completion.zsh b/lib/completion.zsh
index 46b6d8f65..b58612dbf 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -9,7 +9,7 @@ unsetopt flowcontrol
 WORDCHARS=''
 
 autoload -U compinit
-compinit
+compinit -i
 
 zmodload -i zsh/complist
 
diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 87e47bab6..2e282d66a 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -1,6 +1,6 @@
 # TODO: Explain what some of this does..
 autoload -U compinit
-compinit
+compinit -i
 
 bindkey -e
 bindkey '\ew' kill-region
@@ -38,4 +38,4 @@ bindkey ' ' magic-space    # also do history expansion on space
 #bindkey '^I' complete-word
 ## Fix weird sequence that rxvt produces
 #bindkey -s '^[[Z' '\t'
-#
\ No newline at end of file
+#