diff --git a/share/spack/spack-completion.bash b/share/spack/spack-completion.bash
index b8d104aca8ac313bcc582b97f173eba01f2cdc69..818f4d8acfa8f4a67231a5e0be5f48c840398dd7 100755
--- a/share/spack/spack-completion.bash
+++ b/share/spack/spack-completion.bash
@@ -843,7 +843,7 @@ function _spack_view_symlink {
 # Helper functions for subcommands
 
 function _subcommands {
-    spack help | grep "^    [a-z]" | awk '{print $1}'
+    spack help --all | grep "^  [a-z]" | awk '{print $1}' | grep -v spack
 }
 
 function _all_packages {