diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
index a7de646f2..b16a7dffb 100644
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -5,14 +5,6 @@ fi
 
 # Initializes Oh My Zsh
 
-# add a function path
-fpath=($ZSH/functions $ZSH/completions $fpath)
-
-# Load all stock functions (from $fpath files) called below.
-autoload -U compaudit compinit
-
-: ${ZSH_DISABLE_COMPFIX:=true}
-
 # Set ZSH_CUSTOM to the path where your custom config files
 # and plugins exists, or else we will use the default custom/
 if [[ -z "$ZSH_CUSTOM" ]]; then
@@ -25,6 +17,14 @@ if [[ -z "$ZSH_CACHE_DIR" ]]; then
   ZSH_CACHE_DIR="$ZSH/cache"
 fi
 
+# add a function path
+fpath=($ZSH/functions $ZSH/completions $ZSH_CUSTOM/functions $ZSH_CUSTOM/completions $fpath)
+
+# Load all stock functions (from $fpath files) called below.
+autoload -U compaudit compinit
+
+: ${ZSH_DISABLE_COMPFIX:=true}
+
 
 # Load all of the config files in ~/oh-my-zsh that end in .zsh
 # TIP: Add files you don't want in git to .gitignore