diff --git a/layouts/_default/taxonomy.html b/layouts/_default/taxonomy.html
index 15513189..61ee0db4 100644
--- a/layouts/_default/taxonomy.html
+++ b/layouts/_default/taxonomy.html
@@ -3,15 +3,19 @@
{{ partial "paige/article.html" $page }}
-{{ if $page.Pages }}
-
-
- {{ range (sort $page.Pages "Title") }}
- -
- {{ .Title | markdownify }}
-
- {{ end }}
-
-
+{{ if or (eq $page.RelPermalink "/categories/") (eq $page.RelPermalink "/tags/") }}
+ {{ if $page.Pages }}
+
+
+ {{ range (sort $page.Pages "Title") }}
+ -
+ {{ .Title | markdownify }}
+
+ {{ end }}
+
+
+ {{ end }}
+{{ else }}
+ {{ partial "paige/subpages.html" $page }}
{{ end }}
{{ end }}