diff --git a/_layouts/docs.html b/_layouts/docs.html
index 0427db24df..8187905db6 100755
--- a/_layouts/docs.html
+++ b/_layouts/docs.html
@@ -177,11 +177,16 @@
{{ content }}
{% unless page.notags == true %}
- {% assign keywords = page.keywords | split:"," %}
- {% for keyword in keywords %}{% assign strippedKeyword = keyword | strip %}
- {% capture keywordlist %}{{ keywordlist }}{{strippedKeyword}}{% unless forloop.last %}, {% endunless %}{% endcapture %}
- {% endfor %}
- {% if keywordlist.size > 0 %}{{ keywordlist }}{% endif %}
+ {% assign keywords = page.keywords | split:"," -%}
+ {% if keywords.size > 0 -%}
+
+ {%- for keyword in keywords -%}
+ {%- assign strippedKeyword = keyword | strip -%}
+ {{ strippedKeyword }}
+ {%- unless forloop.last %}, {% endunless -%}
+ {% endfor -%}
+
+ {% endif -%}
{% endunless %}