diff --git a/completion/available/bash-it.completion.bash b/completion/available/bash-it.completion.bash
index 6f622e89..67a9fdc3 100644
--- a/completion/available/bash-it.completion.bash
+++ b/completion/available/bash-it.completion.bash
@@ -31,9 +31,11 @@ _bash-it-comp-list-available-not-enabled()
 _bash-it-comp-list-enabled()
 {
   local subdirectory="$1"
+  local suffix enabled_things
 
-  # TODO Check for global directory as well
-  local enabled_things=$(for f in `compgen -G "${BASH_IT}/$subdirectory/enabled/*.bash" | sort`;
+  suffix=$(echo "$subdirectory" | sed -e 's/plugins/plugin/g')
+
+  enabled_things=$(for f in `sort <(compgen -G "${BASH_IT}/$subdirectory/enabled/*.${suffix}.bash") <(compgen -G "${BASH_IT}/enabled/*.${suffix}.bash")`;
     do
       basename $f | cut -d'.' -f1 | sed -e "s/^[0-9]*---//g"
     done)
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index 2175c9ce..7a8e1123 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -77,6 +77,9 @@ function __check_completion () {
   ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/atom.aliases.bash
   assert [ -L "$BASH_IT/aliases/enabled/atom.aliases.bash" ]
 
+  ln -s $BASH_IT/completion/available/apm.completion.bash $BASH_IT/completion/enabled/apm.completion.bash
+  assert [ -L "$BASH_IT/completion/enabled/apm.completion.bash" ]
+
   run __check_completion 'bash-it disable alias a'
   assert_line "0" "all atom"
 }
@@ -85,6 +88,9 @@ function __check_completion () {
   ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/150---atom.aliases.bash
   assert [ -L "$BASH_IT/aliases/enabled/150---atom.aliases.bash" ]
 
+  ln -s $BASH_IT/completion/available/apm.completion.bash $BASH_IT/completion/enabled/350---apm.completion.bash
+  assert [ -L "$BASH_IT/completion/enabled/350---apm.completion.bash" ]
+
   run __check_completion 'bash-it disable alias a'
   assert_line "0" "all atom"
 }
@@ -93,6 +99,9 @@ function __check_completion () {
   ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/enabled/150---atom.aliases.bash
   assert [ -L "$BASH_IT/enabled/150---atom.aliases.bash" ]
 
+  ln -s $BASH_IT/completion/available/apm.completion.bash $BASH_IT/enabled/350---apm.completion.bash
+  assert [ -L "$BASH_IT/enabled/350---apm.completion.bash" ]
+
   run __check_completion 'bash-it disable alias a'
   assert_line "0" "all atom"
 }