diff --git a/appview/issues/issues.go b/appview/issues/issues.go
index 463feda4..5480b561 100644
--- a/appview/issues/issues.go
+++ b/appview/issues/issues.go
@@ -100,6 +100,9 @@ func (rp *Issues) RepoSingleIssue(w http.ResponseWriter, r *http.Request) {
 	}
 
 	entities := []syntax.ATURI{issue.AtUri()}
+	for _, c := range issue.Comments {
+		entities = append(entities, c.AtUri())
+	}
 	reactions, err := db.ListReactionDisplayDataMap(rp.db, entities, 20)
 	if err != nil {
 		l.Error("failed to get reactions", "err", err)
diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go
index f1d6b6e2..6a8b9780 100644
--- a/appview/pages/funcmap.go
+++ b/appview/pages/funcmap.go
@@ -481,6 +481,22 @@ func (p *Pages) funcMap() template.FuncMap {
 		"isGenerated": func(path string) bool {
 			return enry.IsGenerated(path, nil)
 		},
+		// NOTE(boltless): I know... I hate doing this too
+		"asReactionMapMap": func(dict any) map[syntax.ATURI]map[models.ReactionKind]models.ReactionDisplayData {
+			if dict == nil {
+				return make(map[syntax.ATURI]map[models.ReactionKind]models.ReactionDisplayData)
+			}
+			m, _ := dict.(map[syntax.ATURI]map[models.ReactionKind]models.ReactionDisplayData)
+			return m
+		},
+		"asReactionStatusMapMap": func(dict any) map[syntax.ATURI]map[models.ReactionKind]bool {
+			if dict == nil {
+				log.Println("returning empty map")
+				return make(map[syntax.ATURI]map[models.ReactionKind]bool)
+			}
+			m, _ := dict.(map[syntax.ATURI]map[models.ReactionKind]bool)
+			return m
+		},
 		// constant values used to define a template
 		"const": func() map[string]any {
 			return map[string]any{
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 0581a2d8..8e7976be 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -1213,7 +1213,6 @@ func (p *Pages) EditIssueFragment(w io.Writer, params EditIssueParams) error {
 }
 
 type ThreadReactionFragmentParams struct {
-	ThreadAt  syntax.ATURI
 	Kind      models.ReactionKind
 	Count     int
 	Users     []string
@@ -1631,6 +1630,8 @@ type SingleStringParams struct {
 	Owner            identity.Identity
 	CommentList      []models.CommentListItem
 
+	Reactions          map[syntax.ATURI]map[models.ReactionKind]models.ReactionDisplayData
+	UserReacted        map[syntax.ATURI]map[models.ReactionKind]bool
 	VouchRelationships map[syntax.DID]*models.VouchRelationship
 }
 
diff --git a/appview/pages/templates/fragments/comment/commentBody.html b/appview/pages/templates/fragments/comment/commentBody.html
index 1fcfe931..c5f820d7 100644
--- a/appview/pages/templates/fragments/comment/commentBody.html
+++ b/appview/pages/templates/fragments/comment/commentBody.html
@@ -1,7 +1,11 @@
 {{ define "fragments/comment/commentBody" }}
 <div class="comment-body">
   {{ if not .Comment.Deleted }}
-    <div class="prose dark:prose-invert">{{ .Comment.Body.Text | markdown }}</div>
+    <div class="prose dark:prose-invert mb-1">{{ .Comment.Body.Text | markdown }}</div>
+    {{ template "repo/fragments/reactions"
+      (dict "Reactions"   .Reactions
+            "UserReacted" .UserReacted
+            "ThreadAt"    .Comment.AtUri) }}
   {{ else }}
     <div class="prose dark:prose-invert italic text-gray-500 dark:text-gray-400">[deleted by author]</div>
   {{ end }}
diff --git a/appview/pages/templates/fragments/comment/commentList.html b/appview/pages/templates/fragments/comment/commentList.html
index 1b52fd9c..e5f1c9ef 100644
--- a/appview/pages/templates/fragments/comment/commentList.html
+++ b/appview/pages/templates/fragments/comment/commentList.html
@@ -14,6 +14,8 @@
     {{ template "topLevelComment"
       (dict
         "LoggedInUser"      $root.LoggedInUser
+        "Reactions"         (index (asReactionMapMap $root.Reactions) $item.Self.AtUri)
+        "UserReacted"       (index (asReactionStatusMapMap $root.UserReacted) $item.Self.AtUri)
         "VouchRelationship" (index $root.VouchRelationships $item.Self.Did)
         "Comment"           $item.Self) }}
 
@@ -23,6 +25,8 @@
           {{ template "replyComment"
             (dict
               "LoggedInUser"      $root.LoggedInUser
+              "Reactions"         (index (asReactionMapMap $root.Reactions) $reply.AtUri)
+              "UserReacted"       (index (asReactionStatusMapMap $root.UserReacted) $reply.AtUri)
               "VouchRelationship" (index $root.VouchRelationships $reply.Did)
               "Comment"           $reply) }}
         </div>
@@ -58,7 +62,7 @@
 {{ end }}
 
 {{ define "replyComment" }}
-<div class="py-4 pr-4 w-full mx-auto overflow-hidden flex gap-2 ">
+<div class="py-4 pr-4 w-full mx-auto flex gap-2 ">
   <div class="flex-shrink-0">
     {{ template "user/fragments/picLink" (list .Comment.Did.String "size-8 mr-1" .VouchRelationship) }}
   </div>
diff --git a/appview/pages/templates/repo/fragments/reaction.html b/appview/pages/templates/repo/fragments/reaction.html
index 5268b8de..ac02aaec 100644
--- a/appview/pages/templates/repo/fragments/reaction.html
+++ b/appview/pages/templates/repo/fragments/reaction.html
@@ -1,6 +1,5 @@
 {{ define "repo/fragments/reaction" }}
     <button
-        id="reactIndi-{{ .Kind }}"
         class="flex justify-center items-center min-w-8 min-h-8 rounded border
             leading-4 px-3 gap-1 relative group
             {{ if eq .Count 0 }}
@@ -26,12 +25,12 @@
           title="{{ .Kind }}"
         {{ end }}
         {{ if .IsReacted }}
-            hx-delete="/react?subject={{ .ThreadAt }}&kind={{ .Kind }}"
+            hx-delete="/react?kind={{ .Kind }}"
         {{ else }}
-            hx-post="/react?subject={{ .ThreadAt }}&kind={{ .Kind }}"
+            hx-post="/react?kind={{ .Kind }}"
         {{ end }}
         hx-swap="outerHTML"
-        hx-trigger="click from:(#reactBtn-{{ .Kind }}, #reactIndi-{{ .Kind }})"
+        hx-trigger="click from:(previous #reactBtn-{{ .Kind }}, closest button)"
         hx-disabled-elt="this"
     >
         <span>{{ .Kind }}</span> <span>{{ .Count }}</span>
diff --git a/appview/pages/templates/repo/fragments/reactions.html b/appview/pages/templates/repo/fragments/reactions.html
index 4ba3d6c2..0ca5c200 100644
--- a/appview/pages/templates/repo/fragments/reactions.html
+++ b/appview/pages/templates/repo/fragments/reactions.html
@@ -1,10 +1,13 @@
 {{ define "repo/fragments/reactions" }}
-  <div class="flex flex-wrap items-center gap-2">
+  <div class="reactions flex flex-wrap items-center gap-2" hx-include="this">
     {{- $reactions   := .Reactions -}}
     {{- $userReacted := .UserReacted -}}
     {{- $threadAt    := .ThreadAt -}}
 
+    <input name="subject-uri" type="hidden" value="{{ $threadAt }}">
+
     {{ template "reactionsPopup" }}
+
     {{ range $kind := const.OrderedReactionKinds }}
       {{ $reactionData := index $reactions $kind }}
       {{ template "repo/fragments/reaction"
@@ -12,17 +15,13 @@
           "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"
-  >
+  <details 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
@@ -44,7 +43,7 @@
         >
           {{ $kind }}
         </button>
-          {{ end }}
+        {{ end }}
       </div>
   </details>
 {{ end }}
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index 7c2933c8..50487544 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -118,6 +118,8 @@
     template "fragments/comment/commentList"
     (dict
       "LoggedInUser"       $.LoggedInUser
+      "Reactions"          $.Reactions
+      "UserReacted"        $.UserReacted
       "VouchRelationships" $.VouchRelationships
       "CommentList"        $.CommentList)
   }}
diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html
index 3de1b647..c54dc38c 100644
--- a/appview/pages/templates/repo/pulls/pull.html
+++ b/appview/pages/templates/repo/pulls/pull.html
@@ -597,9 +597,11 @@
       {{ range $item.Comments }}
         {{/* template "submissionComment" . */}}
         {{ template "comment"
-          (dict "LoggedInUser" $root.LoggedInUser
+          (dict "LoggedInUser"      $root.LoggedInUser
+                "Reactions"         (index (asReactionMapMap $root.Reactions) .AtUri)
+                "UserReacted"       (index (asReactionStatusMapMap $root.UserReacted) .AtUri)
                 "VouchRelationship" (index $root.VouchRelationships .Did)
-                "Comment" .) }}
+                "Comment"           .) }}
       {{ end }}
     </div>
     {{ if gt $c 0}}
diff --git a/appview/pages/templates/strings/string.html b/appview/pages/templates/strings/string.html
index 9115d4b5..9e02de7b 100644
--- a/appview/pages/templates/strings/string.html
+++ b/appview/pages/templates/strings/string.html
@@ -99,6 +99,8 @@
       template "fragments/comment/commentList"
       (dict
         "LoggedInUser"       .LoggedInUser
+        "Reactions"          .Reactions
+        "UserReacted"        .UserReacted
         "VouchRelationships" .VouchRelationships
         "CommentList"        .CommentList)
     }}
diff --git a/appview/pulls/single.go b/appview/pulls/single.go
index 1a551542..871e0bad 100644
--- a/appview/pulls/single.go
+++ b/appview/pulls/single.go
@@ -161,6 +161,11 @@ func (s *Pulls) repoPullHelper(w http.ResponseWriter, r *http.Request, interdiff
 	}
 
 	entities := []syntax.ATURI{pull.AtUri()}
+	for _, s := range pull.Submissions {
+		for _, c := range s.Comments {
+			entities = append(entities, c.AtUri())
+		}
+	}
 	reactions, err := db.ListReactionDisplayDataMap(s.db, entities, 20)
 	if err != nil {
 		l.Error("failed to get pull reactions", "err", err)
diff --git a/appview/state/reaction.go b/appview/state/reaction.go
index d887a28c..3257ed70 100644
--- a/appview/state/reaction.go
+++ b/appview/state/reaction.go
@@ -19,7 +19,7 @@ func (s *State) React(w http.ResponseWriter, r *http.Request) {
 	l := s.logger.With("handler", "React")
 	currentUser := s.oauth.GetMultiAccountUser(r)
 
-	subject := r.URL.Query().Get("subject")
+	subject := r.FormValue("subject-uri")
 	if subject == "" {
 		l.Warn("invalid form")
 		return
@@ -78,7 +78,6 @@ func (s *State) React(w http.ResponseWriter, r *http.Request) {
 		l.Info("created atproto record", "uri", resp.Uri)
 
 		s.pages.ThreadReactionFragment(w, pages.ThreadReactionFragmentParams{
-			ThreadAt:  subjectUri,
 			Kind:      reactionKind,
 			Count:     reactionMap[reactionKind].Count,
 			Users:     reactionMap[reactionKind].Users,
@@ -117,7 +116,6 @@ func (s *State) React(w http.ResponseWriter, r *http.Request) {
 		}
 
 		s.pages.ThreadReactionFragment(w, pages.ThreadReactionFragmentParams{
-			ThreadAt:  subjectUri,
 			Kind:      reactionKind,
 			Count:     reactionMap[reactionKind].Count,
 			Users:     reactionMap[reactionKind].Users,
diff --git a/appview/strings/strings.go b/appview/strings/strings.go
index 12fc400b..bf872f88 100644
--- a/appview/strings/strings.go
+++ b/appview/strings/strings.go
@@ -162,6 +162,23 @@ func (s *Strings) contents(w http.ResponseWriter, r *http.Request) {
 		l.Error("failed to get comments", "err", err)
 	}
 
+	var entities []syntax.ATURI
+	for _, c := range comments {
+		entities = append(entities, c.AtUri())
+	}
+	reactions, err := db.ListReactionDisplayDataMap(s.Db, entities, 20)
+	if err != nil {
+		l.Error("failed to get reactions", "err", err)
+	}
+
+	var userReactions map[syntax.ATURI]map[models.ReactionKind]bool
+	if user != nil {
+		userReactions, err = db.ListReactionStatusMap(s.Db, entities, syntax.DID(user.Did))
+		if err != nil {
+			l.Error("failed to get user reactions", "err", err)
+		}
+	}
+
 	vouchRelationships := make(map[syntax.DID]*models.VouchRelationship)
 	if user != nil {
 		var participants []syntax.DID
@@ -185,6 +202,8 @@ func (s *Strings) contents(w http.ResponseWriter, r *http.Request) {
 		Owner:        id,
 		CommentList:  models.NewCommentList(comments),
 
+		Reactions:          reactions,
+		UserReacted:        userReactions,
 		VouchRelationships: vouchRelationships,
 	})
 }