diff --git a/lib/PoorBooru/Backend/Controller/Media.pm b/lib/PoorBooru/Backend/Controller/Media.pm
index d0f6b3d..93ba2b9 100644
--- a/lib/PoorBooru/Backend/Controller/Media.pm
+++ b/lib/PoorBooru/Backend/Controller/Media.pm
@@ -57,7 +57,7 @@ sub show ($self)
 	return $self->render(
 		template => "media",
 		media    => $media,
-		#pager    => { $self->pager_links($res->json->{pager}) },
+		pager    => { $self->pager_links($res->json->{pager}) },
 	);
 };
 
diff --git a/templates/media.html.ep b/templates/media.html.ep
index 849d009..d5af6e6 100644
--- a/templates/media.html.ep
+++ b/templates/media.html.ep
@@ -15,6 +15,6 @@
   <dd><%= $media->{content_type} %></dd>
   <dt>Tags</dt>
 <% for my $tag ($media->{tags}->@*) { %>
-  <dd><%= $tag %></dd>
+  <dd><%= link_to $tag => url_for("tag_show", tag_id_or_name => $tag) %></dd>
 <% } %>
 </dl>