diff --git a/appview/pages/funcmap.go b/appview/pages/funcmap.go
index cb8e533a..17cc456c 100644
--- a/appview/pages/funcmap.go
+++ b/appview/pages/funcmap.go
@@ -458,6 +458,15 @@ func (p *Pages) funcMap() template.FuncMap {
 		"safeUrl": func(s string) template.URL {
 			return template.URL(s)
 		},
+		"sanitizeAtUri": func(u syntax.ATURI) string {
+			s := strings.ToLower(u.String())
+			s = strings.TrimPrefix(s, "at://")
+			s = strings.NewReplacer(":", "-", "/", "-", ".", "-").Replace(s)
+			return s
+		},
+		"safeCSS": func(s string) template.CSS {
+			return template.CSS(s)
+		},
 		"tinyAvatar": func(handle string) string {
 			return p.AvatarUrl(handle, "tiny")
 		},
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 3a9abb2d..1b03e14f 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -1313,12 +1313,11 @@ func (p *Pages) EditIssueFragment(w io.Writer, params EditIssueParams) error {
 }
 
 type ThreadReactionFragmentParams struct {
-	Kind        models.ReactionKind
-	Count       int
-	Users       []string
-	IsReacted   bool
-	CommentRkey string
-	SubjectUri  string
+	Kind       models.ReactionKind
+	Count      int
+	Users      []string
+	IsReacted  bool
+	SubjectUri string
 }
 
 func (p *Pages) ThreadReactionFragment(w io.Writer, params ThreadReactionFragmentParams) error {
diff --git a/appview/pages/templates/fragments/comment/commentHeader.html b/appview/pages/templates/fragments/comment/commentHeader.html
index 51f814a4..0c86ce83 100644
--- a/appview/pages/templates/fragments/comment/commentHeader.html
+++ b/appview/pages/templates/fragments/comment/commentHeader.html
@@ -13,7 +13,7 @@
     {{ if not .Comment.Deleted }}
       <div class="ml-auto flex items-center gap-4 opacity-0 group-hover/comment:opacity-100">
         {{ if .LoggedInUser }}
-          {{ template "repo/fragments/reactionsPopup" (dict "CommentRkey" (string .Comment.Rkey) "Scope" "header") }}
+          {{ template "repo/fragments/reactionsPopup" (dict "SubjectUri" .Comment.AtUri "Scope" "header") }}
         {{ end }}
         {{ if $isCommentOwner }}
           {{ if not .Comment.IsLegacy }}
diff --git a/appview/pages/templates/repo/fragments/reaction.html b/appview/pages/templates/repo/fragments/reaction.html
index cb1f8b48..c5ab3d36 100644
--- a/appview/pages/templates/repo/fragments/reaction.html
+++ b/appview/pages/templates/repo/fragments/reaction.html
@@ -1,5 +1,7 @@
 {{ define "repo/fragments/reaction" }}
     <button
+        data-reaction-kind="{{ .Kind }}"
+        data-subject-uri="{{ .SubjectUri | string | safeUrl }}"
         class="flex justify-center items-center min-h-8 rounded border
             leading-4 px-2 gap-1.5 text-sm relative group
             {{ if eq .Count 0 }}
@@ -28,7 +30,7 @@
             hx-post="/react?kind={{ .Kind }}&subject-uri={{ .SubjectUri | urlquery }}"
         {{ end }}
         hx-swap="outerHTML"
-        hx-trigger="click from:(.reactBtn-{{ .CommentRkey }}-{{ .Kind }}, closest button)"
+        hx-trigger="click from:button[data-subject-uri='{{ .SubjectUri }}'][data-reaction-kind='{{ .Kind }}']"
         hx-disabled-elt="this"
     >
         <span class="inline group-[.htmx-request]:hidden">{{ .Kind }}</span>
diff --git a/appview/pages/templates/repo/fragments/reactions.html b/appview/pages/templates/repo/fragments/reactions.html
index 99c0fa39..023c217c 100644
--- a/appview/pages/templates/repo/fragments/reactions.html
+++ b/appview/pages/templates/repo/fragments/reactions.html
@@ -4,7 +4,6 @@
     {{- $userReacted := .UserReacted -}}
     {{- $threadAt    := .ThreadAt -}}
     {{- $parts       := splitOn (string $threadAt) "/" -}}
-    {{- $commentRkey := index $parts (sub (len $parts) 1) -}}
 
     <input name="subject-uri" type="hidden" value="{{ $threadAt }}">
 
@@ -16,12 +15,11 @@
           "Count"       $reactionData.Count
           "IsReacted"   (index $userReacted $kind)
           "Users"       $reactionData.Users
-          "CommentRkey" $commentRkey
           "SubjectUri"  $threadAt) }}
     {{ end }}
 
     {{ if or (not .HideIfEmpty) (gt (len $reactions) 0) }}
-      {{ template "repo/fragments/reactionsPopup" (dict "CommentRkey" $commentRkey "Scope" "body") }}
+      {{ template "repo/fragments/reactionsPopup" (dict "SubjectUri" $threadAt "Scope" "body") }}
     {{ end }}
 
   </div>
diff --git a/appview/pages/templates/repo/fragments/reactionsPopup.html b/appview/pages/templates/repo/fragments/reactionsPopup.html
index 394342b9..3f302a83 100644
--- a/appview/pages/templates/repo/fragments/reactionsPopup.html
+++ b/appview/pages/templates/repo/fragments/reactionsPopup.html
@@ -1,9 +1,9 @@
 {{ define "repo/fragments/reactionsPopup" }}
-  {{ $id := printf "%s-%s" (string .CommentRkey) .Scope }}
+  {{ $id := printf "%s-%s" (sanitizeAtUri .SubjectUri) .Scope }}
   <button
     type="button"
     popovertarget="reactions-popover-{{ $id }}"
-    style="anchor-name: --reactions-anchor-{{ $id }}"
+    style="anchor-name: --reactions-anchor-{{ $id | safeCSS }}"
     class="
     flex justify-center items-center rounded
     text-gray-400 dark:text-gray-400
@@ -15,7 +15,7 @@
   <div
     id="reactions-popover-{{ $id }}"
     popover
-    style="position-anchor: --reactions-anchor-{{ $id }};"
+    style="position-anchor: --reactions-anchor-{{ $id | safeCSS }};"
     class="[&:popover-open]:grid grid-cols-4 [position-area:bottom_center] justify-self-center w-max inset-auto mt-1 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg"
   >
     {{ range $kind := const.OrderedReactionKinds }}
@@ -23,7 +23,9 @@
       type="button"
       popovertarget="reactions-popover-{{ $id }}"
       popovertargetaction="hide"
-      class="reactBtn-{{ $.CommentRkey }}-{{ $kind }} btn-flat px-3 text-base hover:bg-gray-100 dark:hover:bg-gray-700"
+      data-reaction-kind="{{ $kind }}"
+      data-subject-uri="{{ $.SubjectUri | string | safeUrl }}"
+      class="btn-flat px-3 text-base hover:bg-gray-100 dark:hover:bg-gray-700"
     >
       {{ $kind }}
     </button>
diff --git a/appview/state/reaction.go b/appview/state/reaction.go
index e0a5eddf..15b40532 100644
--- a/appview/state/reaction.go
+++ b/appview/state/reaction.go
@@ -81,12 +81,11 @@ func (s *State) React(w http.ResponseWriter, r *http.Request) {
 		l.Info("created atproto record", "uri", resp.Uri)
 
 		s.pages.ThreadReactionFragment(w, pages.ThreadReactionFragmentParams{
-			Kind:        reactionKind,
-			Count:       reactionMap[reactionKind].Count,
-			Users:       reactionMap[reactionKind].Users,
-			IsReacted:   true,
-			CommentRkey: subjectUri.RecordKey().String(),
-			SubjectUri:  subject,
+			Kind:       reactionKind,
+			Count:      reactionMap[reactionKind].Count,
+			Users:      reactionMap[reactionKind].Users,
+			IsReacted:  true,
+			SubjectUri: subject,
 		})
 
 		return
@@ -121,12 +120,11 @@ func (s *State) React(w http.ResponseWriter, r *http.Request) {
 		}
 
 		s.pages.ThreadReactionFragment(w, pages.ThreadReactionFragmentParams{
-			Kind:        reactionKind,
-			Count:       reactionMap[reactionKind].Count,
-			Users:       reactionMap[reactionKind].Users,
-			IsReacted:   false,
-			CommentRkey: subjectUri.RecordKey().String(),
-			SubjectUri:  subject,
+			Kind:       reactionKind,
+			Count:      reactionMap[reactionKind].Count,
+			Users:      reactionMap[reactionKind].Users,
+			IsReacted:  false,
+			SubjectUri: subject,
 		})
 
 		return