diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index f17208e..52f19c0 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -6,8 +6,9 @@
   {{ end }}
 </div>
 <div class="cards" id="cards">
-  {{ range .Pages }}
-    {{ if .Params.category }}
+  {{ $currentCat := .Title }}
+  {{ range .Site.RegularPages }}
+    {{ if and (.Params.category) (or (eq $currentCat "All") (eq .Params.category $currentCat)) }}
       {{ partial "card.html" . }}
     {{ end }}
   {{ end }}