diff --git a/_layouts/post.liquid b/_layouts/post.liquid
index ccb659c..89e1e6a 100644
--- a/_layouts/post.liquid
+++ b/_layouts/post.liquid
@@ -34,10 +34,12 @@ layout: default
         {% for tag in page.tags %}
           {% if url_beginning == '/blog/' %}
             <a href="{{ tag | slugify | prepend: '/blog/tag/' | prepend: site.baseurl}}"> <i class="fa-solid fa-hashtag fa-sm"></i> {{ tag }}</a>
-            &nbsp;
           {% else %}
-            <i class="fa-solid fa-hashtag fa-sm"></i> {{ tag }} &nbsp;
+            <i class="fa-solid fa-hashtag fa-sm"></i> {{ tag }}
           {% endif %}
+          {% unless forloop.last %}
+            &nbsp;
+          {% endunless %}
         {% endfor %}
       {% endif %}
 
@@ -48,10 +50,12 @@ layout: default
             <a href="{{ category | slugify | prepend: '/blog/category/' | prepend: site.baseurl}}">
               <i class="fa-solid fa-tag fa-sm"></i> {{ category -}}
             </a>
-            &nbsp;
           {% else %}
-            <i class="fa-solid fa-tag fa-sm"></i> {{ category }} &nbsp;
+            <i class="fa-solid fa-tag fa-sm"></i> {{ category }}
           {% endif %}
+          {% unless forloop.last %}
+            &nbsp;
+          {% endunless %}
         {% endfor %}
       {% endif %}
     </p>