diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index 3902b7741a..e76566ec64 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,5 +1,9 @@
-{{ if .Content }}
 {{ partial "header.html" . }}
+{{ if .Content }}
 {{ .Content }}
-{{ partial "footer.html" . }}
+{{ else }}
+{{ with (index (index .Site.Sections .Section) 0)  }}
+{{ .Page.Content }}
 {{ end }}
+{{ end }}
+{{ partial "footer.html" . }}