diff --git a/appview/pages/compose_parse_test.go b/appview/pages/compose_parse_test.go
--- a/appview/pages/compose_parse_test.go
+++ b/appview/pages/compose_parse_test.go
@@ -31,7 +31,6 @@
 		{"pullCompareBranches", []string{"repo/pulls/fragments/pullCompareBranches"}},
 		{"pullCompareForksBranches", []string{"repo/pulls/fragments/pullCompareForksBranches"}},
 		{"pull.html via repo base", []string{"layouts/base", "layouts/repobase", "repo/pulls/pull"}},
-		{"pullNewComment", []string{"repo/pulls/fragments/pullNewComment"}},
 		{"pullComment", []string{"fragments/comment/pullComment"}},
 	}
 
diff --git a/appview/pages/pages.go b/appview/pages/pages.go
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -1586,17 +1586,6 @@
 	return p.executePlain("repo/pulls/fragments/pullActions", w, params)
 }
 
-type PullNewCommentParams struct {
-	BaseParams
-	RepoInfo    repoinfo.RepoInfo
-	Pull        *models.Pull
-	RoundNumber int
-}
-
-func (p *Pages) PullNewCommentFragment(w io.Writer, params PullNewCommentParams) error {
-	return p.executePlain("repo/pulls/fragments/pullNewComment", w, params)
-}
-
 type RepoCompareParams struct {
 	BaseParams
 	RepoInfo repoinfo.RepoInfo
diff --git a/appview/pulls/comment.go b/appview/pulls/comment.go
deleted file mode 100644
--- a/appview/pulls/comment.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package pulls
-
-import (
-	"net/http"
-	"strconv"
-
-	"tangled.org/core/appview/models"
-	"tangled.org/core/appview/pages"
-
-	"github.com/go-chi/chi/v5"
-)
-
-func (s *Pulls) PullComment(w http.ResponseWriter, r *http.Request) {
-	l := s.logger.With("handler", "PullComment")
-
-	user := s.oauth.GetMultiAccountUser(r)
-	if user != nil {
-		l = l.With("user", user.Did)
-	}
-
-	pull, ok := r.Context().Value("pull").(*models.Pull)
-	if !ok {
-		l.Error("failed to get pull")
-		s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
-		return
-	}
-	l = l.With("pull_id", pull.PullId, "pull_owner", pull.OwnerDid)
-
-	roundNumberStr := chi.URLParam(r, "round")
-	roundNumber, err := strconv.Atoi(roundNumberStr)
-	if err != nil || roundNumber < 0 || roundNumber >= len(pull.Submissions) {
-		http.Error(w, "bad round id", http.StatusBadRequest)
-		l.Error("failed to parse round id", "err", err, "round_number_str", roundNumberStr)
-		return
-	}
-
-	switch r.Method {
-	case http.MethodGet:
-		s.pages.PullNewCommentFragment(w, pages.PullNewCommentParams{
-			BaseParams:  pages.BaseParamsFromContext(r.Context()),
-			RepoInfo:    s.repoResolver.GetRepoInfo(r, user),
-			Pull:        pull,
-			RoundNumber: roundNumber,
-		})
-		return
-	}
-}
diff --git a/appview/pulls/router.go b/appview/pulls/router.go
--- a/appview/pulls/router.go
+++ b/appview/pulls/router.go
@@ -26,7 +26,6 @@
 			r.Get("/", s.RepoPullPatch)
 			r.Get("/interdiff", s.RepoPullInterdiff)
 			r.Get("/actions", s.PullActions)
-			r.Get("/comment", s.PullComment)
 		})
 
 		r.Route("/round/{round}.patch", func(r chi.Router) {
diff --git a/appview/pages/templates/repo/pulls/fragments/pullActions.html b/appview/pages/templates/repo/pulls/fragments/pullActions.html
--- a/appview/pages/templates/repo/pulls/fragments/pullActions.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullActions.html
@@ -37,19 +37,51 @@
     {{ if and (not $loading) $isLastRound }}
       {{ template "resubmitStatus" . }}
     {{ end }}
-    <div id="actions-{{$roundNumber}}" hx-target="this" class="flex flex-wrap gap-2 relative"
+    <input type="checkbox" id="comment-toggle-{{$roundNumber}}" class="peer/comment hidden"/>
+    <div class="hidden peer-checked/comment:flex flex-col gap-2">
+      <form
+        class="w-full flex flex-wrap gap-2 group"
+        hx-post="/comment"
+        hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:find textarea"
+        hx-target="#pull-comments-{{ .RoundNumber }}"
+        hx-swap="beforeend"
+        hx-disabled-elt="find button[type='submit']"
+        hx-on::after-request="if(event.target === this && event.detail.successful) htmx.ajax('GET', '/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions', {target: '#action-card-{{ .RoundNumber }}', swap: 'outerHTML'})"
+      >
+        <input name="subject-uri" type="hidden" value="{{ .Pull.AtUri }}">
+        <input name="pull-round-idx" type="hidden" value="{{ .RoundNumber }}">
+        {{ template "fragments/markdownEditor"
+          (dict "Name"        "body"
+                "BlobName"    "blob"
+                "Rows"        8
+                "Required"    true
+                "Placeholder" "Add to the discussion...") }}
+        <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm w-full">
+          <label title="Toggle comment form" for="comment-toggle-{{$roundNumber}}" class="btn-flat text-red-500 dark:text-red-400 flex gap-2 items-center">
+            {{ i "x" "size-4" }}
+            <span>Cancel</span>
+          </label>
+          <button
+            type="submit"
+            class="btn-create-flat flex items-center gap-2">
+              {{ i "reply" "size-4 inline group-[.htmx-request]:hidden" }}
+              {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }}
+              Reply
+          </button>
+        </div>
+        <div id="comment-error-{{ .RoundNumber }}" class="error"></div>
+      </form>
+    </div>
+    <div id="actions-{{$roundNumber}}" hx-target="this" class="peer-checked/comment:hidden flex flex-wrap gap-2 relative"
       {{ if $loading }}
         hx-swap="outerHTML"
       {{ end }}
     >
       {{ if .LoggedInUser }}
-      <button
-        hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment"
-        class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group">
-          {{ i "message-square-plus" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
-          {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-          Comment
-      </button>
+      <label title="Toggle comment form" for="comment-toggle-{{$roundNumber}}" class="btn-flat">
+        {{ i "message-square-plus" "size-4" }}
+        <span>Comment</span>
+      </label>
       {{ end }}
       {{ if and (not $loading) .BranchDeleteStatus }}
         <button
diff --git a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html b/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
deleted file mode 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{{ define "repo/pulls/fragments/pullNewComment" }}
-<div class="w-full flex flex-col gap-2">
-  {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }}
-  <form
-    class="w-full flex flex-wrap gap-2 group"
-    hx-post="/comment"
-    hx-trigger="submit, keydown[(ctrlKey || metaKey) && key=='Enter'] from:find textarea"
-    hx-target="#pull-comments-{{ .RoundNumber }}"
-    hx-swap="beforeend"
-    hx-disabled-elt="find button[type='submit']"
-    hx-on::after-request="if(event.target === this && event.detail.successful) htmx.ajax('GET', '/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions', {target: '#action-card-{{ .RoundNumber }}', swap: 'outerHTML'})"
-  >
-    <input name="subject-uri" type="hidden" value="{{ .Pull.AtUri }}">
-    <input name="pull-round-idx" type="hidden" value="{{ .RoundNumber }}">
-    {{ template "fragments/markdownEditor"
-      (dict "Name"        "body"
-            "BlobName"    "blob"
-            "Rows"        8
-            "Required"    true
-            "Placeholder" "Add to the discussion...") }}
-    {{ template "replyActions" . }}
-    <div id="comment-error-{{ .RoundNumber }}" class="error"></div>
-  </form>
-</div>
-{{ end }}
-
-{{ define "replyActions" }}
-  <div class="flex flex-wrap items-stretch justify-end gap-2 text-gray-500 dark:text-gray-400 text-sm w-full">
-    {{ template "cancel" . }}
-    {{ template "reply" . }}
-  </div>
-{{ end }}
-
-{{ define "cancel" }}
-  <button
-    type="button"
-    class="btn-flat text-red-500 dark:text-red-400 flex gap-2 items-center group"
-    hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"
-    hx-swap="outerHTML"
-    hx-target="#action-card-{{.RoundNumber}}"
-  >
-    {{ i "x" "w-4 h-4" }}
-    <span>Cancel</span>
-  </button>
-{{ end }}
-
-{{ define "reply" }}
-  <button
-    type="submit"
-    class="btn-create-flat flex items-center gap-2">
-      {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
-      {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-      Reply
-  </button>
-{{ end }}