diff --git a/plugins/docker/_docker b/plugins/docker/_docker
index 880b6faa6..711412593 100644
--- a/plugins/docker/_docker
+++ b/plugins/docker/_docker
@@ -11,7 +11,7 @@
 # Output a selectable list of all running docker containers
 __docker_containers() {
     declare -a cont_cmd
-    cont_cmd=($(docker ps | awk 'NR>1{print $1":[CON("$1")"$2"("$3")]"}'))
+    cont_cmd=($(docker ps -a | awk 'NR>1{split($NF,names,","); print names[1]":[CON("$1")"$2"("$3")("$NF")]"}'))
     _describe 'containers' cont_cmd
 }