diff --git a/pkg/action/show.go b/pkg/action/show.go
index a3fbcfa9e..6d6e10d24 100644
--- a/pkg/action/show.go
+++ b/pkg/action/show.go
@@ -129,10 +129,10 @@ func (s *Show) Run(chartpath string) (string, error) {
 	if s.OutputFormat == ShowCRDs || s.OutputFormat == ShowAll {
 		crds := s.chart.CRDObjects()
 		if len(crds) > 0 {
-			if s.OutputFormat == ShowAll && !bytes.HasPrefix(crds[0].File.Data, []byte("---")) {
-				fmt.Fprintln(&out, "---")
-			}
 			for _, crd := range crds {
+				if !bytes.HasPrefix(crd.File.Data, []byte("---")) {
+					fmt.Fprintln(&out, "---")
+				}
 				fmt.Fprintf(&out, "%s\n", string(crd.File.Data))
 			}
 		}
diff --git a/pkg/action/show_test.go b/pkg/action/show_test.go
index b1c5d6164..67eba2338 100644
--- a/pkg/action/show_test.go
+++ b/pkg/action/show_test.go
@@ -32,6 +32,7 @@ func TestShow(t *testing.T) {
 			{Name: "crds/ignoreme.txt", Data: []byte("error")},
 			{Name: "crds/foo.yaml", Data: []byte("---\nfoo\n")},
 			{Name: "crds/bar.json", Data: []byte("---\nbar\n")},
+			{Name: "crds/baz.yaml", Data: []byte("baz\n")},
 		},
 		Raw: []*chart.File{
 			{Name: "values.yaml", Data: []byte("VALUES\n")},
@@ -58,6 +59,9 @@ foo
 ---
 bar
 
+---
+baz
+
 `
 	if output != expect {
 		t.Errorf("Expected\n%q\nGot\n%q\n", expect, output)
@@ -105,6 +109,7 @@ func TestShowCRDs(t *testing.T) {
 			{Name: "crds/ignoreme.txt", Data: []byte("error")},
 			{Name: "crds/foo.yaml", Data: []byte("---\nfoo\n")},
 			{Name: "crds/bar.json", Data: []byte("---\nbar\n")},
+			{Name: "crds/baz.yaml", Data: []byte("baz\n")},
 		},
 	}
 
@@ -119,6 +124,9 @@ foo
 ---
 bar
 
+---
+baz
+
 `
 	if output != expect {
 		t.Errorf("Expected\n%q\nGot\n%q\n", expect, output)