diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 1972136..0754055 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -16,7 +16,7 @@
                 <span> </span>
                 <strong>Tags:</strong>
                 {{ range .Params.tags }}
-                    <a href="/tags/{{ . }}">#{{ . }}</a>
+                    <a href="/tags/{{ . | urlize }}">#{{ . }}</a>
                 {{ end }}
             </p>
         {{ end }}
diff --git a/layouts/partials/article_card.html b/layouts/partials/article_card.html
index aaf07d3..ff725af 100644
--- a/layouts/partials/article_card.html
+++ b/layouts/partials/article_card.html
@@ -10,7 +10,7 @@
             | <!-- Pipe character as visual separator between date and tags-->
             <span title="Tags"> </span>
             {{ range .Params.tags }}
-                <a href="/tags/{{ . }}">#{{ . }}</a>
+                <a href="/tags/{{ . | urlize }}">#{{ . }}</a>
             {{ end }}
         {{ end }}
         </p>