diff --git a/layouts/partials/head/meta.html b/layouts/partials/head/meta.html
index 32356603..af2f6183 100644
--- a/layouts/partials/head/meta.html
+++ b/layouts/partials/head/meta.html
@@ -3,7 +3,18 @@
 <meta name="author" content="{{ .Site.Author.name }}">
 <meta name="author-link" content="{{ .Site.Author.link }}">
 <meta name="description" content="{{ with .Description }}{{ . }}{{ else }}{{ if .IsPage | and .Summary }}{{ .Summary }}{{ else }}{{ with .Site.Params.description }}{{ . }}{{ end }}{{ end }}{{ end }}" />
-<meta name="keywords" content="{{ $keywords := .Keywords }}{{ if not $keywords }}{{ if .IsPage | and .Params.tags }}{{ $keywords = .Params.tags }}{{ else }}{{ $keywords = .Site.Params.keywords }}{{ end }}{{ end }}{{ range $index, $keyword := $keywords }}{{ if ne $index 0 }},{{ end }}{{ $keyword }}{{ end }}" />
+
+{{- $keywords := .Keywords -}}
+{{- if not $keywords -}}
+  {{- if .IsPage | and .Params.tags -}}
+    {{- $keywords = .Params.tags -}}
+  {{- else -}}
+    {{- $keywords = .Site.Params.keywords -}}
+  {{- end -}}
+{{- end -}}
+{{- with $keywords -}}
+  <meta name="keywords" content='{{ delimit . ", " }}' />
+{{- end -}}
 
 {{- template "_internal/schema.html" . -}}
 {{- template "_internal/opengraph.html" . -}}