diff --git a/app/views/exceptions/not_found.html.erb b/app/views/exceptions/not_found.html.erb
index a789bc863fb..b9268d34954 100644
--- a/app/views/exceptions/not_found.html.erb
+++ b/app/views/exceptions/not_found.html.erb
@@ -6,7 +6,7 @@
   <div class="span8 popular-topics">
     <h2 class="popular-topics-title"><%= t 'page_not_found.popular_topics' %></h2>
     <% @top_viewed.each do |t| %>
-      <%= link_to t.title, t.relative_url %><br/>
+      <span style="line-height:2;"><%= link_to t.title, t.relative_url %><% if !t.category.uncategorized? %>&nbsp;&nbsp;<a href="<%= t.category.url %>" class="badge badge-category" style="background-color: #<%= t.category.color %>; color: #<%= t.category.text_color %>"><%= t.category.name %></a><% end %></span><br/>
     <% end %>
     <br/>
     <a href="/latest" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a>
@@ -14,7 +14,7 @@
   <div class="span8 recent-topics">
     <h2 class="recent-topics-title"><%= t 'page_not_found.recent_topics' %></h2>
     <% @recent.each do |t| %>
-      <%= link_to t.title, t.relative_url %><br/>
+      <span style="line-height:2;"><%= link_to t.title, t.relative_url %><% if !t.category.uncategorized? %>&nbsp;&nbsp;<a href="<%= t.category.url %>" class="badge badge-category" style="background-color: #<%= t.category.color %>; color: #<%= t.category.text_color %>"><%= t.category.name %></a><% end %></span><br/>
     <% end %>
     <br/>
     <a href="/latest" class="btn"><%= t 'page_not_found.see_more' %>&hellip;</a>