diff --git a/layouts/partials/utils/description.html b/layouts/partials/utils/description.html
index 107a4e7a1d..41dea9c8f2 100644
--- a/layouts/partials/utils/description.html
+++ b/layouts/partials/utils/description.html
@@ -1,6 +1,6 @@
 {{ $desc := "" }}
 {{ if .Description }}
-  {{ $desc = .Description }}
+  {{ $desc = strings.Replace .Description "\n" " " }}
 {{ else }}
   {{ with .File }}
     {{ with (index (site.Data.frontmatter) .Path) }}
diff --git a/layouts/partials/utils/keywords.html b/layouts/partials/utils/keywords.html
index a6365d580e..f68e302b59 100644
--- a/layouts/partials/utils/keywords.html
+++ b/layouts/partials/utils/keywords.html
@@ -1,11 +1,11 @@
 {{ $keywords := "" }}
 {{ if .Keywords }}
-  {{ $keywords = strings.Split (collections.Delimit .Keywords " ") ", " }}
+  {{ $keywords = delimit .Keywords " " }}
 {{ else }}
   {{ with .File }}
     {{ with (index (site.Data.frontmatter) .Path) }}
       {{ with .keywords }}
-        {{ $keywords = strings.Split (strings.Trim . "\n") ", " }}
+        {{ $keywords = strings.Replace (strings.Trim . "\n") "\n" " " }}
       {{ end }}
     {{ end }}
   {{ end }}