diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index bce9df9cee..f21a8df0c3 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -4138,15 +4138,15 @@ _docker_manifest() {
 		annotate
 		create
 		inspect
+		ls
 		push
 		rm
-		ls
 	"
 
 	local aliases="
 		list
 	"
-	__docker_subcommands "$subcommands" && return
+	__docker_subcommands "$subcommands $aliases" && return
 
 	case "$cur" in
 		-*)
@@ -4254,7 +4254,17 @@ _docker_manifest_rm() {
 	esac
 }
 
+_docker_manifest_list() {
+  _docker_manifest_ls
+}
+
 _docker_manifest_ls() {
+	case "$prev" in
+		--format)
+			return
+			;;
+	esac
+
 	case "$cur" in
 		-*)
 			COMPREPLY=( $( compgen -W "--format --help --quiet -q" -- "$cur" ) )