diff --git a/layouts/partials/content-details.html b/layouts/partials/content-details.html
index 914d2c3..03dd161 100644
--- a/layouts/partials/content-details.html
+++ b/layouts/partials/content-details.html
@@ -12,7 +12,7 @@
   <a href="{{ ref . "/tags" }}" class="no-color-change mr-1" title="Tags">
     <i class="fas fa-tags small"></i>
   </a>
-  {{ range $i, $e := .Params.tags }}
+  {{ range (.Params.tags | sort) }}
     <a href="/tags/{{ urlize . }}" class="mr-1" title="{{ . }}">#{{ . }}</a>
   {{ end }}
 {{ end }}
diff --git a/layouts/partials/metadata.html b/layouts/partials/metadata.html
index 0c3a661..8738e23 100644
--- a/layouts/partials/metadata.html
+++ b/layouts/partials/metadata.html
@@ -59,8 +59,10 @@
 <meta name="author" content="{{ title .Site.Params.author }}" />
 <meta name="canonical" content="{{ .Permalink }}" />
 
-{{ range .Params.tags }}
-  <meta property="article:tag" content="{{ . }}" />
+{{ if .Params.tags }}
+  {{ range (.Params.tags | sort) }}
+    <meta property="article:tag" content="{{ . }}" />
+  {{ end }}
 {{ end }}
 
 {{ range .AlternativeOutputFormats }}