diff --git a/lib/completion.zsh b/lib/completion.zsh
index c231ee21e..2b6e1a182 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -9,7 +9,8 @@ unsetopt flowcontrol
 WORDCHARS=''
 
 autoload -U compinit
-compinit
+# -i to avoid 'insecure directories prompt after sudo'
+compinit -i 
 
 zmodload -i zsh/complist
 
diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh
index 87e47bab6..bad9cd2f6 100644
--- a/lib/key-bindings.zsh
+++ b/lib/key-bindings.zsh
@@ -1,7 +1,4 @@
 # TODO: Explain what some of this does..
-autoload -U compinit
-compinit
-
 bindkey -e
 bindkey '\ew' kill-region
 bindkey -s '\el' "ls\n"
@@ -38,4 +35,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
+#