diff --git a/scripts/west_commands/completion/west-completion.bash b/scripts/west_commands/completion/west-completion.bash
index c5d61a8f449..2ccc4446ad3 100644
--- a/scripts/west_commands/completion/west-completion.bash
+++ b/scripts/west_commands/completion/west-completion.bash
@@ -392,7 +392,8 @@ __set_comp_west_projs()
 
 __set_comp_west_boards()
 {
-	__set_comp "$(__west_x boards --format={name} "$@")"
+	boards="$(__west_x boards --format={identifiers} "$@")\n$(__west_x boards --format={name} "$@")"
+	__set_comp ${boards//,/\ }
 }
 
 __comp_west_west()