diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 99be9856..b7b09a6b 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -1343,7 +1343,7 @@ _docker_run() {
 		--workdir -w
 	"
 
-	local all_options="$options_with_args
+	local boolean_options="
 		--disable-content-trust=false
 		--help
 		--interactive -i
@@ -1354,14 +1354,14 @@ _docker_run() {
 		--tty -t
 	"
 
+	local all_options="$options_with_args $boolean_options"
+
 	[ "$command" = "run" ] && all_options="$all_options
 		--detach -d
 		--rm
 		--sig-proxy=false
 	"
 
-	local options_with_args_glob=$(__docker_to_extglob "$options_with_args")
-
 	case "$prev" in
 		--add-host)
 			case "$cur" in
@@ -1486,7 +1486,7 @@ _docker_run() {
 			__docker_containers_all
 			return
 			;;
-		$options_with_args_glob )
+		$(__docker_to_extglob "$options_with_args") )
 			return
 			;;
 	esac