diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md
index 067ec8a1d2f..4801b481a42 100644
--- a/doc/news/_preparation_next_release.md
+++ b/doc/news/_preparation_next_release.md
@@ -491,6 +491,7 @@ you up to date with the multi-language support provided by Elektra.
 - `kdb list-tools` now supports `KDB_EXEC_PATH` environment variables that contain spaces. _(René Schwaiger)_
 - `gen-gpg-testkey` is added to the default tools list (see [#2668](https://github.com/ElektraInitiative/libelektra/issues/2668))._(Peter Nirschl)_
 - `kdb getenv` now executed correctly from within tests _(Markus Raab)_
+- `kdb-bash-completion` was fixed (see [#2836](https://github.com/ElektraInitiative/libelektra/pull/2836)). _(Eduardo Santana)_
 - <<TODO>>
 
 - <<TODO>>
diff --git a/scripts/kdb-bash-completion b/scripts/kdb-bash-completion
index c19e2aaece4..c90216d7095 100644
--- a/scripts/kdb-bash-completion
+++ b/scripts/kdb-bash-completion
@@ -23,7 +23,7 @@ _kdb() {
 	# only kdb was entered yet, print a list of available commands
 	if [[ $COMP_CWORD -eq 1 ]]; then
 		local IFS=$'\n'
-		local commands=($(${kdbpath} 2> /dev/null | sed -e '0,/^Known commands are/d' | awk '{print $1}'))
+		local commands=($(${kdbpath} list-commands))
 		COMPREPLY=($(compgen -W '${commands[@]}' -- "${cur}"))
 		return
 	fi