diff --git a/bash_completion.d/trezorctl.sh b/bash_completion.d/trezorctl.sh
index ec1b30e29..684035897 100644
--- a/bash_completion.d/trezorctl.sh
+++ b/bash_completion.d/trezorctl.sh
@@ -5,7 +5,7 @@ _trezorctl()
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    cmds=$(trezorctl --help | grep -A 1 'Available commands:' | tail -n 1 | tr '{},' '   ')
+    cmds=$(trezorctl --help | grep '^  [a-z]' | awk '{ print $1 }')
 
     COMPREPLY=($(compgen -W "${cmds}" -- ${cur}))
     return 0