diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 85959f4e77..5097cca4ce 100755
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -359,7 +359,10 @@ _docker_docker() {
 			COMPREPLY=( $( compgen -W "$boolean_options $main_options_with_args" -- "$cur" ) )
 			;;
 		*)
-			COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
+			local counter="$(__docker_pos_first_nonflag $main_options_with_args_glob)"
+			if [ $cword -eq $counter ]; then
+				COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
+			fi
 			;;
 	esac
 }