diff --git a/atlas/templates/atlas/series_viewer.html b/atlas/templates/atlas/series_viewer.html
index c3458e48..9eb6fdf8 100755
--- a/atlas/templates/atlas/series_viewer.html
+++ b/atlas/templates/atlas/series_viewer.html
@@ -40,8 +40,8 @@ This series is not associated with any cases.
         <button class="view-finding-button" data-annotationjson={{finding.annotation_json}}
             data-viewportjson={{finding.viewport_json}} data-findingid={{finding.id}}>Click to view</button>
         <span class="view-finding-details">
-            Finding(s): {{finding.findings.all|join:", "}}<br />
-            Structure(s): {{finding.structures.all|join:", "}}<br />
+            Finding(s): {% for f in finding.findings.all %}{{f.get_link}}{% endfor %}<br />
+            Structure(s): {% for s in finding.structures.all %}{{s.get_link}}{% endfor %}<br />
             Description: {{finding.description}}<br />
         </span>
         <a href="{% url 'atlas:series_edit_finding' pk=series.pk finding_pk=finding.pk %}" class="edit-finding-link">Edit</a>