diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index 097cec54..f23bb156 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -34,13 +34,24 @@
 
 {% block mediagoblin_content -%}
   <h1>
-    {%- trans username=user.username,
-              user_url=request.urlgen(
-                         'mediagoblin.user_pages.user_home',
-                          user=user.username) -%}
-      <a href="{{ user_url }}">{{ username }}</a>'s media
-    {%- endtrans %}{% if tag %}{% trans %} with tag '{{tag}}'{% endtrans %}
-      {%- endif %}
+    {% if tag %}
+      {%- trans username=user.username,
+                user_url=request.urlgen(
+                           'mediagoblin.user_pages.user_home',
+                            user=user.username),
+                tag_url=request.urlgen(
+                           'mediagoblin.listings.tags_listing',
+                           tag=tag) -%}
+        <a href="{{ user_url }}">{{ username }}</a>'s media with tag <a href="{{ tag_url }}">{{ tag }}</a>
+      {%- endtrans %}
+    {% else %}
+      {%- trans username=user.username,
+                user_url=request.urlgen(
+                           'mediagoblin.user_pages.user_home',
+                            user=user.username) -%}
+        <a href="{{ user_url }}">{{ username }}</a>'s media
+      {%- endtrans %}
+    {% endif %}
   </h1>
 
   {{ object_gallery(request, media_entries, pagination) }}