diff --git a/commands.go b/commands.go
index 2ca026eb81..4fe91bb8eb 100644
--- a/commands.go
+++ b/commands.go
@@ -975,6 +975,7 @@ func (srv *Server) CmdRun(stdin io.ReadCloser, stdout rcli.DockerConn, args ...s
 	}
 	Debugf("Waiting for attach to return\n")
 	<-attachErr
+	container.Wait()
 	// Expecting I/O pipe error, discarding
 	return nil
 }