diff --git a/.gitignore b/.gitignore
index b27cddd0..dc868103 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ custom/*
 !custom/example.bash
 .rvmrc
 aliases/custom.aliases.bash
+completion/custom.completion.bash
 lib/custom.bash
 plugins/custom.plugins.bash
 *.swp
diff --git a/bash_it.sh b/bash_it.sh
index 226213fd..aed180df 100755
--- a/bash_it.sh
+++ b/bash_it.sh
@@ -38,17 +38,16 @@ do
   source $config_file
 done
 
-# Load enabled aliases, completion, plugins
+# Load enabled and custom aliases, completion, plugins
 for file_type in "aliases" "completion" "plugins"
 do
   _load_bash_it_files $file_type
-done
 
-# Load any custom aliases that the user has added
-if [ -e "${BASH_IT}/aliases/custom.aliases.bash" ]
-then
-  source "${BASH_IT}/aliases/custom.aliases.bash"
-fi
+  if [ -e "${BASH_IT}/${file_type}/custom.${file_type}.bash" ]
+  then
+    source "${BASH_IT}/${file_type}/custom.${file_type}.bash"
+  fi
+done
 
 # Custom
 CUSTOM="${BASH_IT}/custom/*.bash"