diff --git a/shell-completion/hledger-completion.bash b/shell-completion/hledger-completion.bash
index fb5f3b36d..1bd0f0774 100644
--- a/shell-completion/hledger-completion.bash
+++ b/shell-completion/hledger-completion.bash
@@ -103,7 +103,7 @@ _hledger_extension_completion_function() {
 # Register completion function for hledger:
 complete -F _hledger_completion_function hledger
 
-# Register complete functions for hledger extensions:
+# Register completion functions for hledger extensions:
 complete -F _hledger_extension_completion_function hledger-ui
 complete -F _hledger_extension_completion_function hledger-web
 complete -F _hledger_extension_completion_function hledger-api
@@ -959,8 +959,6 @@ cat <<TEXT > "$_HLEDGER_COMPLETION_TEMPDIR/options-activity.txt"
 TEXT
 
 cat <<TEXT > "$_HLEDGER_COMPLETION_TEMPDIR/options-balance.txt"
--------------------
-----------------------
 --alias
 --anon
 --auto
diff --git a/shell-completion/output-options.sh b/shell-completion/output-options.sh
index fef6ec12d..3123e416b 100755
--- a/shell-completion/output-options.sh
+++ b/shell-completion/output-options.sh
@@ -11,7 +11,7 @@ main() {
 
     # Do not print '=' after long options with arg because it makes completion
     # for option arguments harder.
-    sed -rn 's/.* (--[-a-zA-Z0-9]+)=?.*/\1/gp' < "$tmp"
+    sed -rn 's/.* (--[a-zA-Z][-_a-zA-Z0-9]*)=?.*/\1/gp' < "$tmp"
 }
 
 main "$@"