diff --git a/completion/available/bash-it.completion.bash b/completion/available/bash-it.completion.bash
index 5222a484..2ab35879 100644
--- a/completion/available/bash-it.completion.bash
+++ b/completion/available/bash-it.completion.bash
@@ -25,7 +25,7 @@ _bash-it-comp-list-enabled()
 {
 	subdirectory="$1"
 
-	local enabled_things=$(for f in `ls -1 "${BASH_IT}/$subdirectory/enabled/"*.bash 2>/dev/null`;
+	local enabled_things=$(for f in `compgen -G "${BASH_IT}/$subdirectory/enabled/*.bash"`;
 		do
 			basename $f | cut -d'.' -f1 | sed -e "s/^[0-9]*---//g"
 		done)
@@ -37,7 +37,7 @@ _bash-it-comp-list-available()
 {
 	subdirectory="$1"
 
-	local enabled_things=$(for f in `ls -1 "${BASH_IT}/$subdirectory/available/"*.bash`;
+	local enabled_things=$(for f in `compgen -G "${BASH_IT}/$subdirectory/available/*.bash"`;
 		do
 			basename $f | cut -d'.' -f1
 		done)
diff --git a/test/completion/bash-it.completion.bats b/test/completion/bash-it.completion.bats
index 49042e66..2175c9ce 100644
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@@ -65,6 +65,11 @@ function __check_completion () {
 
 @test "completion bash-it: disable - provide nothing when atom is not enabled" {
   run __check_completion 'bash-it disable alias ato'
+  assert_line "0" ""
+}
+
+@test "completion bash-it: disable - provide all when atom is not enabled" {
+  run __check_completion 'bash-it disable alias a'
   assert_line "0" "all"
 }