diff --git a/app/views/list/list.erb b/app/views/list/list.erb
index 17d9e09615d..df9267ab952 100644
--- a/app/views/list/list.erb
+++ b/app/views/list/list.erb
@@ -1,6 +1,10 @@
 <div class="topic-list">
 <% @list.topics.each do |t| %>
-  <a href="<%= t.relative_url %>"><%= t.title %></a> <span title='<%= t 'posts' %>'>(<%= t.posts_count %>)</span><br/>
+  <a href="<%= t.relative_url %>"><%= t.title %></a>
+  <% if !@category && t.category %>
+    [<a href="/category/<%= t.category.slug.blank? ? t.category.id : t.category.slug %>"><%= t.category.name %></a>]
+  <% end %>
+  <span title='<%= t 'posts' %>'>(<%= t.posts_count %>)</span><br/>
 <% end %>
 </div>
 
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
index d18069c5b4f..30020d80377 100644
--- a/app/views/topics/show.html.erb
+++ b/app/views/topics/show.html.erb
@@ -1,6 +1,9 @@
 <h2>
    <%= render_topic_title(@topic_view.topic) %>
 </h2>
+<% if c = @topic_view.topic.category %>
+  <a href="/category/<%= c.slug.blank? ? c.id : c.slug %>"><%= c.name %></a>
+<% end %>
 <hr/>
 
 <% @topic_view.posts.each do |post| %>