diff --git a/lib/completion.zsh b/lib/completion.zsh
index 21735e7e..3c5a41e1 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -60,7 +60,3 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
 # ... unless we really want to.
 zstyle '*' single-ignored show
 
-# Load and run compinit
-autoload -U compinit
-compinit -i
-
diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index 291772df..84a850ca 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -14,6 +14,10 @@ for config_file ($ZSH/custom/*.zsh) source $config_file
 plugin=${plugin:=()}
 for plugin ($plugins) source $ZSH/plugins/$plugin/$plugin.plugin.zsh
 
+# Load and run compinit
+autoload -U compinit
+compinit -i
+
 # Load the theme
 source "$ZSH/themes/$ZSH_THEME.zsh-theme"