diff --git a/appview/pages/templates/repo/fragments/reactions.html b/appview/pages/templates/repo/fragments/reactions.html
new file mode 100644
index 00000000..4ba3d6c2
--- /dev/null
+++ b/appview/pages/templates/repo/fragments/reactions.html
@@ -0,0 +1,50 @@
+{{ define "repo/fragments/reactions" }}
+  <div class="flex flex-wrap items-center gap-2">
+    {{- $reactions   := .Reactions -}}
+    {{- $userReacted := .UserReacted -}}
+    {{- $threadAt    := .ThreadAt -}}
+
+    {{ template "reactionsPopup" }}
+    {{ range $kind := const.OrderedReactionKinds }}
+      {{ $reactionData := index $reactions $kind }}
+      {{ template "repo/fragments/reaction"
+        (dict
+          "Kind"      $kind
+          "Count"     $reactionData.Count
+          "IsReacted" (index $userReacted $kind)
+          "ThreadAt"  $threadAt
+          "Users"     $reactionData.Users) }}
+    {{ end }}
+  </div>
+{{ end }}
+
+{{ define "reactionsPopup" }}
+  <details
+    id="reactionsPopUp"
+    class="relative inline-block"
+  >
+    <summary
+      class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700
+      hover:bg-gray-50
+      hover:border-gray-300
+      dark:hover:bg-gray-700
+      dark:hover:border-gray-600
+      cursor-pointer list-none"
+    >
+      {{ i "smile" "size-4" }}
+    </summary>
+      <div
+        class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg"
+      >
+        {{ range $kind := const.OrderedReactionKinds }}
+        <button
+          id="reactBtn-{{ $kind }}"
+          class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700"
+          hx-on:click="this.parentElement.parentElement.removeAttribute('open')"
+        >
+          {{ $kind }}
+        </button>
+          {{ end }}
+      </div>
+  </details>
+{{ end }}
diff --git a/appview/pages/templates/repo/fragments/reactionsPopUp.html b/appview/pages/templates/repo/fragments/reactionsPopUp.html
deleted file mode 100644
index 1464d3fa..00000000
--- a/appview/pages/templates/repo/fragments/reactionsPopUp.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{{ define "repo/fragments/reactionsPopUp" }}
-    <details
-        id="reactionsPopUp"
-        class="relative inline-block"
-    >
-        <summary
-            class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700
-                hover:bg-gray-50
-                hover:border-gray-300
-                dark:hover:bg-gray-700
-                dark:hover:border-gray-600
-                cursor-pointer list-none"
-        >
-            {{ i "smile" "size-4" }}
-        </summary>
-        <div
-            class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg"
-        >
-            {{ range $kind := . }}
-                <button
-                    id="reactBtn-{{ $kind }}"
-                    class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700"
-                    hx-on:click="this.parentElement.parentElement.removeAttribute('open')"
-                >
-                    {{ $kind }}
-                </button>
-            {{ end }}
-        </div>
-    </details>
-{{ end }}
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index ccd9f2bd..ac485f7f 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -35,8 +35,11 @@
   {{ if .Issue.Body }}
     <article id="body" class="mt-4 prose dark:prose-invert">{{ .Issue.Body | markdown }}</article>
   {{ end }}
-  <div class="flex flex-wrap gap-2 items-stretch mt-4">
-    {{ template "issueReactions" . }}
+  <div class="mt-4">
+    {{ template "repo/fragments/reactions"
+      (dict "Reactions"   .Reactions
+            "UserReacted" .UserReacted
+            "ThreadAt"    .Issue.AtUri) }}
   </div>
 </section>
 {{ end }}
@@ -107,25 +110,6 @@
   </a>
 {{ end }}
 
-{{ define "issueReactions" }}
-  <div class="flex items-center gap-2">
-      {{ template "repo/fragments/reactionsPopUp" const.OrderedReactionKinds }}
-      {{ range $kind := const.OrderedReactionKinds }}
-          {{ $reactionData := index $.Reactions $kind }}
-          {{
-              template "repo/fragments/reaction"
-              (dict
-                  "Kind"      $kind
-                  "Count"     $reactionData.Count
-                  "IsReacted" (index $.UserReacted $kind)
-                  "ThreadAt"  $.Issue.AtUri
-                  "Users"     $reactionData.Users)
-          }}
-      {{ end }}
-  </div>
-{{ end }}
-
-
 {{ define "repoAfter" }}
   <div class="flex flex-col gap-4 mt-4">
   {{
diff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
index 7d2c0eae..df3ce000 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
@@ -63,23 +63,12 @@
         </article>
     {{ end }}
 
-    {{ with const.OrderedReactionKinds }}
-    <div class="flex items-center gap-2 mt-2">
-        {{ template "repo/fragments/reactionsPopUp" . }}
-        {{ range $kind := . }}
-            {{ $reactionData := index $.Reactions $kind }}
-            {{
-                template "repo/fragments/reaction"
-                (dict
-                    "Kind"      $kind
-                    "Count"     $reactionData.Count
-                    "IsReacted" (index $.UserReacted $kind)
-                    "ThreadAt"  $.Pull.AtUri
-                    "Users"     $reactionData.Users)
-            }}
-        {{ end }}
+    <div class="mt-2">
+      {{ template "repo/fragments/reactions"
+        (dict "Reactions"   .Reactions
+              "UserReacted" .UserReacted
+              "ThreadAt"    .Pull.AtUri) }}
     </div>
-    {{ end }}
 </section>