diff --git a/app/views/tags/_context.html.haml b/app/views/tags/_context.html.haml
index 5f3fb78c..7c96aab2 100644
--- a/app/views/tags/_context.html.haml
+++ b/app/views/tags/_context.html.haml
@@ -11,3 +11,11 @@
   %a(href='http://www.linux-presentation-day.org')
     = image_tag 'linux-presentation-day.png', width: '150', height: '75',
       alt: 'Linux presentation day', style: 'vertical-align: middle'
+
+- elsif action_name != 'show'
+  %em.fa.fa-tag
+    = params[:tag]
+
+- if action_name != 'show'
+  %a(href="?tag=")
+    %em.fa.fa-times