diff --git a/views/userviews.py b/views/userviews.py
index 04bdb31..31e965c 100644
--- a/views/userviews.py
+++ b/views/userviews.py
@@ -199,7 +199,12 @@ class base_view(object):
         for t in self.item.tag_set.all():
             i += 1
             edit_url = pygal.url_tagedit(self.request, t.id) if self.may_modify() else None
+            search_query = 'tag:%s' % t.text
+            search_url = pygal.url_userview(self.request, '', search=search_query)
             b.append_entry('tag-%d' % i, t.text, themes.color_icon_url(self.request, '%d.png' % (i % 10)), edit_url, True, False)
+            if pygal.get_search_query(self.request) != search_query:
+                b.append_entry_to_entry('tag-%d' % i, 'tagedit-%d' % i, _('Edit'), themes.gray_icon_url(self.request, 'edit2.png'), edit_url, True, False)
+                b.append_entry_to_entry('tag-%d' % i, 'tagsearch-%d' % i, _('Search'), themes.gray_icon_url(self.request, 'search.png'), search_url, True, False)
         return b
 
     @property