diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 8be6d25111..b40fc4141d 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -68,7 +68,7 @@ __docker_previous_extglob_setting=$(shopt -p extglob)
 shopt -s extglob
 
 __docker_q() {
-	docker ${host:+-H "$host"} ${config:+--config "$config"} 2>/dev/null "$@"
+	docker ${host:+--host "$host"} ${config:+--config "$config"} ${context:+--context "$context"} 2>/dev/null "$@"
 }
 
 # __docker_configs returns a list of configs. Additional options to
@@ -1158,6 +1158,10 @@ _docker_docker() {
 			_filedir -d
 			return
 			;;
+		--context|-c)
+			__docker_complete_contexts
+			return
+			;;
 		--log-level|-l)
 			__docker_complete_log_levels
 			return
@@ -5419,6 +5423,7 @@ _docker() {
 	"
 	local global_options_with_args="
 		--config
+		--context -c
 		--host -H
 		--log-level -l
 		--tlscacert
@@ -5431,7 +5436,7 @@ _docker() {
 	# variables to cache client info, populated on demand for performance reasons
 	local client_experimental stack_orchestrator_is_kubernetes stack_orchestrator_is_swarm
 
-	local host config
+	local host config context
 
 	COMPREPLY=()
 	local cur prev words cword
@@ -5454,6 +5459,11 @@ _docker() {
 				(( counter++ ))
 				config="${words[$counter]}"
 				;;
+			# save context so that completion can use custom daemon
+			--context|-c)
+				(( counter++ ))
+				context="${words[$counter]}"
+				;;
 			$(__docker_to_extglob "$global_options_with_args") )
 				(( counter++ ))
 				;;