diff --git a/app/views/content_viewer/view_page.rhtml b/app/views/content_viewer/view_page.rhtml
index fe422fd..1d082a9 100644
--- a/app/views/content_viewer/view_page.rhtml
+++ b/app/views/content_viewer/view_page.rhtml
@@ -1,7 +1,7 @@
 <h2><%= @page.title %></h2>
 
 <div>
-  <%= _('Tags: %s') % @page.tags %>
+  <%= _('Tags: %s') % (@page.tags.map { |t| link_to(t, tag_url(:tag => t.name)) }.join(', ')) %>
 </div>
 
 <% if @page.parent && !@page.parent.path.blank? %>
--
libgit2 0.21.2