diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index 41b6ad7f9a..361ade355a 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -712,8 +712,10 @@ __docker_container_subcommand() {
                 "($help -s --size)"{-s,--size}"[Display total file sizes]" \
                 "($help)--since=[Show only containers created since...]:containers:__docker_complete_containers" && ret=0
             ;;
-        (pause)
-            __docker_subcommand && ret=0
+        (pause|unpause)
+            _arguments $(__docker_arguments) \
+                $opts_help \
+                "($help -)*:containers:__docker_complete_running_containers" && ret=0
             ;;
         (port)
             __docker_subcommand && ret=0
@@ -745,9 +747,6 @@ __docker_container_subcommand() {
         (top)
             __docker_subcommand && ret=0
             ;;
-        (unpause)
-            __docker_subcommand && ret=0
-            ;;
         (update)
             __docker_subcommand && ret=0
             ;;
@@ -2077,9 +2076,7 @@ __docker_subcommand() {
             esac
             ;;
         (pause|unpause)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:containers:__docker_complete_running_containers" && ret=0
+            __docker_container_subcommand && ret=0
             ;;
         (plugin)
             local curcontext="$curcontext" state