diff --git a/web/src/lib/components/comment/Comment.svelte b/web/src/lib/components/comment/Comment.svelte
index 2550dd39..43fcd1cd 100644
--- a/web/src/lib/components/comment/Comment.svelte
+++ b/web/src/lib/components/comment/Comment.svelte
@@ -1,6 +1,7 @@
+{#snippet avatarLink(person: AvatarPerson)}
+
+
+
+{/snippet}
+
{#each shown as person, i (person.did)}
-
-
-
+ {#if popover}
+
+ {@render avatarLink(person)}
+
+ {:else}
+ {@render avatarLink(person)}
+ {/if}
{/each}
diff --git a/web/src/lib/components/repo/issues/IssueCardContent.svelte b/web/src/lib/components/repo/issues/IssueCardContent.svelte
index b9ec4f70..0269b5ae 100644
--- a/web/src/lib/components/repo/issues/IssueCardContent.svelte
+++ b/web/src/lib/components/repo/issues/IssueCardContent.svelte
@@ -1,6 +1,7 @@