diff --git a/layouts/partials/social_metadata.html b/layouts/partials/social_metadata.html
index 3382f79..d77f3b2 100644
--- a/layouts/partials/social_metadata.html
+++ b/layouts/partials/social_metadata.html
@@ -12,8 +12,7 @@
     {{ end }}
     {{ if .IsHome }}
     <title>{{ default .Site.Title .Title }}</title>
-    <meta name="description" content="{{ $.Site.Params.description }}" />
-    <meta name="keywords" content="{{ $.Site.Params.Keywords }}" />
+    <meta name="description" content="{{ default $.Site.Params.description .Description }}" />
     <meta property="og:image" content="{{ .Site.BaseURL}}{{ .Site.Params.SocialImage }}" />
     <meta property="og:url" content="{{ .Site.BaseURL }}" />
     <meta property="og:title" content="{{ default .Site.Title .Title }}" />
@@ -25,11 +24,7 @@
     {{ else }}
     <title>{{ .Title }} &middot; {{ .Site.Title }}</title>
     <meta name="description" content="{{ .Description }}" />
-    {{ if .Params.tags }}
-    <meta name="keywords" content="{{ range .Params.tags }}{{ . }},{{ end }}" />
-    {{ else }}
-    <meta name="keywords" content="{{ $.Site.Params.Keywords }}" />
-    {{ end }}
+
     <meta property="og:url" content="{{ .Permalink }}" />
     <meta property="og:title" content="{{ .Title }} &middot; {{ .Site.Title }}" />
     <meta name="twitter:title" content="{{ .Title }} &middot; {{ .Site.Title }}" />
@@ -47,3 +42,10 @@
     <meta name="twitter:image:src" content="{{ .Site.Params.SocialImage }}" />
     {{ end }}
     {{ end }}
+    {{ if .Params.tags }}
+    <meta name="keywords" content="{{ range .Params.tags }}{{ . }},{{ end }}" />
+    {{ else if .Keywords }}
+    <meta name="keywords" content="{{ range .Keywords }}{{ . }},{{ end }}" />
+    {{ else }}
+    <meta name="keywords" content="{{ $.Site.Params.Keywords }}" />
+    {{ end }}