diff --git a/packages/blog/templates/blog/plugins/tags.html b/packages/blog/templates/blog/plugins/tags.html
index 99b4705..c6e07fb 100644
--- a/packages/blog/templates/blog/plugins/tags.html
+++ b/packages/blog/templates/blog/plugins/tags.html
@@ -17,4 +17,4 @@
         {% endfor %}
     </ul>
 </div>
-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}
diff --git a/packages/blog/templates/blog/post_list.html b/packages/blog/templates/blog/post_list.html
index 736ee6c..7fd1d56 100644
--- a/packages/blog/templates/blog/post_list.html
+++ b/packages/blog/templates/blog/post_list.html
@@ -11,12 +11,20 @@
         <h2>
         {% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
         {% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
-        {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
+        {% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tag|capfirst }}
         {% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
         {{ category }}
         </h2>
     </header>
     {% endblock %}
+    {% if tags %}
+        <ul class="blog-tags">
+        {% for tag in tags %}
+            {{ tag.count }}
+            <li class="blog-tag"><a class="btn btn-xs btn-default" href="{% url "blog:posts-tagged" tag=tag.slug %}">{{ tag.name }}</a></li>
+        {% endfor %}
+        </ul>
+    {% endif %}
     <div class="clearfix"></div>
     <div class="blog-list-older">
     {% for post in post_list %}
@@ -48,4 +56,4 @@
     {% endif %}
 </section>
 {% endblock %}
-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}
diff --git a/packages/blog/views.py b/packages/blog/views.py
index 4c28008..f96d22a 100644
--- a/packages/blog/views.py
+++ b/packages/blog/views.py
@@ -8,7 +8,7 @@ from django.views.generic import ListView, DetailView
 from parler.views import ViewUrlMixin, TranslatableSlugMixin
 
 from aldryn_apphooks_config.mixins import AppConfigMixin
-
+from taggit.models import Tag
 from .models import Post, BlogCategory, BLOG_CURRENT_POST_IDENTIFIER
 from .settings import get_setting
 
@@ -45,6 +45,7 @@ class PostListView(BaseBlogView, ListView):
     def get_context_data(self, **kwargs):
         context = super(PostListView, self).get_context_data(**kwargs)
         context['TRUNCWORDS_COUNT'] = get_setting('POSTS_LIST_TRUNCWORDS_COUNT')
+        context['tags'] = Tag.objects.all()
         return context
 
 
@@ -106,6 +107,8 @@ class TaggedListView(BaseBlogView, ListView):
         kwargs['tagged_entries'] = (self.kwargs.get('tag')
                                     if 'tag' in self.kwargs else None)
         context = super(TaggedListView, self).get_context_data(**kwargs)
+        if kwargs['tagged_entries']:
+            context['tag'] = Tag.objects.get(slug=kwargs['tagged_entries'])
         context['TRUNCWORDS_COUNT'] = get_setting('POSTS_LIST_TRUNCWORDS_COUNT')
         return context
 
diff --git a/zsite/static/less/blog.less b/zsite/static/less/blog.less
index b2f445f..2b47b19 100644
--- a/zsite/static/less/blog.less
+++ b/zsite/static/less/blog.less
@@ -31,10 +31,10 @@
         li {
             .make-xs-column(12);
 
-            
+
 
             width: 100%;
-            
+
             font-size: 12px;
 
             vertical-align: top;
@@ -46,12 +46,12 @@
             }
         }
     }
-    
+
     @media (min-width: @screen-xs) {
         li {
             .make-xs-column(6);
             .make-sm-column(3);
-            
+
             min-height: 140px;
         }
     }
@@ -85,12 +85,12 @@ article {
 
 article.post-item {
     .make-row();
-    
+
     content {
         .make-xs-column(12);
         .make-sm-column(9);
     }
-    
+
     side {
         .make-xs-column(3);
 
@@ -105,3 +105,14 @@ article.post-item {
 
 
 }
+
+/* block tags template blog/post_list.html line 21 */
+
+.blog-tags {
+    padding-left: 0;
+}
+
+.blog-tag {
+    display: inline-block;
+    margin: 2px 0;
+}