diff --git a/pkg/commands/docker.go b/pkg/commands/docker.go
index 9885d305..7779e4e0 100644
--- a/pkg/commands/docker.go
+++ b/pkg/commands/docker.go
@@ -252,11 +252,13 @@ func (c *DockerCommand) GetContainers(existingContainers []*Container) ([]*Conta
 		}
 
 		newContainer.Container = ctr
-		// if the container is made with a name label we will use that
-		if name, ok := ctr.Labels["name"]; ok {
+		// if the container is made with a name then use that directly
+		if len(ctr.Names) > 0 && ctr.Names[0] != "" {
+			newContainer.Name = strings.TrimLeft(ctr.Names[0], "/")
+		} else if name, ok := ctr.Labels["name"]; ok {
 			newContainer.Name = name
 		} else {
-			newContainer.Name = strings.TrimLeft(ctr.Names[0], "/")
+			newContainer.Name = "Unknown"
 		}
 		newContainer.ServiceName = ctr.Labels["com.docker.compose.service"]
 		newContainer.ProjectName = ctr.Labels["com.docker.compose.project"]