diff --git a/cluster/cluster.go b/cluster/cluster.go
index 5d4b4cef32..ae56d1dab9 100644
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -78,7 +78,7 @@ func (c *Cluster) Container(IdOrName string) *Container {
 
 		// Match name, /name or engine/name.
 		for _, name := range container.Names {
-			if name == IdOrName || name == "/"+IdOrName || container.node.ID+name == IdOrName {
+			if name == IdOrName || name == "/"+IdOrName || container.node.ID+name == IdOrName || container.node.Name+name == IdOrName {
 				return container
 			}
 		}