diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index e22d23f..05a733d 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -448,14 +448,14 @@ func (p *Pages) EditPinsFragment(w io.Writer, params EditPinsParams) error {
 	return p.executePlain("user/fragments/editPins", w, params)
 }
 
-type RepoActionsFragmentParams struct {
+type RepoStarFragmentParams struct {
 	IsStarred bool
 	RepoAt    syntax.ATURI
 	Stats     db.RepoStats
 }
 
-func (p *Pages) RepoActionsFragment(w io.Writer, params RepoActionsFragmentParams) error {
-	return p.executePlain("repo/fragments/repoActions", w, params)
+func (p *Pages) RepoStarFragment(w io.Writer, params RepoStarFragmentParams) error {
+	return p.executePlain("repo/fragments/repoStar", w, params)
 }
 
 type RepoDescriptionParams struct {
diff --git a/appview/pages/templates/layouts/repobase.html b/appview/pages/templates/layouts/repobase.html
index 502a681..9fdd77e 100644
--- a/appview/pages/templates/layouts/repobase.html
+++ b/appview/pages/templates/layouts/repobase.html
@@ -19,7 +19,29 @@
           <a href="/{{ .RepoInfo.FullName }}" class="font-bold">{{ .RepoInfo.Name }}</a>
         </div>
 
-        {{ template "repo/fragments/repoActions" .RepoInfo }}
+        <div class="flex items-center gap-2 z-auto">
+          {{ template "repo/fragments/repoStar" .RepoInfo }}
+          {{ if .RepoInfo.DisableFork }}
+            <button
+              class="btn text-sm no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"
+              disabled
+              title="Empty repositories cannot be forked"
+            >
+              {{ i "git-fork" "w-4 h-4" }}
+              fork
+            </button>
+          {{ else }}
+            <a
+              class="btn text-sm no-underline hover:no-underline flex items-center gap-2 group"
+              hx-boost="true"
+              href="/{{ .RepoInfo.FullName }}/fork"
+            >
+              {{ i "git-fork" "w-4 h-4" }}
+              fork
+              {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+            </a>
+          {{ end }}
+        </div>
       </div>
       {{ template "repo/fragments/repoDescription" . }}
     </section>
diff --git a/appview/pages/templates/repo/fragments/repoActions.html b/appview/pages/templates/repo/fragments/repoActions.html
deleted file mode 100644
index 64fdb8d..0000000
--- a/appview/pages/templates/repo/fragments/repoActions.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{{ define "repo/fragments/repoActions" }}
-    <div class="flex items-center gap-2 z-auto">
-        <button
-            id="starBtn"
-            class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group"
-            {{ if .IsStarred }}
-                hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"
-            {{ else }}
-                hx-post="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"
-            {{ end }}
-
-            hx-trigger="click"
-            hx-target="#starBtn"
-            hx-swap="outerHTML"
-            hx-disabled-elt="#starBtn"
-        >
-          {{ if .IsStarred }}
-              {{ i "star" "w-4 h-4 fill-current" }}
-          {{ else }}
-              {{ i "star" "w-4 h-4" }}
-          {{ end }}
-          <span class="text-sm">
-              {{ .Stats.StarCount }}
-          </span>
-          {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-        </button>
-        {{ if .DisableFork }}
-            <button
-                class="btn text-sm no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"
-                disabled
-                title="Empty repositories cannot be forked"
-            >
-                {{ i "git-fork" "w-4 h-4" }}
-                fork
-            </button>
-        {{ else }}
-            <a
-                class="btn text-sm no-underline hover:no-underline flex items-center gap-2 group"
-                hx-boost="true"
-                href="/{{ .FullName }}/fork"
-            >
-                {{ i "git-fork" "w-4 h-4" }}
-                fork
-                {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
-            </a>
-        {{ end }}
-    </div>
-{{ end }}
diff --git a/appview/pages/templates/repo/fragments/repoStar.html b/appview/pages/templates/repo/fragments/repoStar.html
new file mode 100644
index 0000000..7ca59a9
--- /dev/null
+++ b/appview/pages/templates/repo/fragments/repoStar.html
@@ -0,0 +1,26 @@
+{{ define "repo/fragments/repoStar" }}
+    <button
+        id="starBtn"
+        class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group"
+        {{ if .IsStarred }}
+            hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"
+        {{ else }}
+            hx-post="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"
+        {{ end }}
+
+        hx-trigger="click"
+        hx-target="this"
+        hx-swap="outerHTML"
+        hx-disabled-elt="#starBtn"
+    >
+        {{ if .IsStarred }}
+            {{ i "star" "w-4 h-4 fill-current" }}
+        {{ else }}
+            {{ i "star" "w-4 h-4" }}
+        {{ end }}
+        <span class="text-sm">
+            {{ .Stats.StarCount }}
+        </span>
+        {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
+    </button>
+{{ end }}
diff --git a/appview/state/star.go b/appview/state/star.go
index a66403d..2a956aa 100644
--- a/appview/state/star.go
+++ b/appview/state/star.go
@@ -74,7 +74,7 @@ func (s *State) Star(w http.ResponseWriter, r *http.Request) {
 
 		s.notifier.NewStar(r.Context(), star)
 
-		s.pages.RepoActionsFragment(w, pages.RepoActionsFragmentParams{
+		s.pages.RepoStarFragment(w, pages.RepoStarFragmentParams{
 			IsStarred: true,
 			RepoAt:    subjectUri,
 			Stats: db.RepoStats{
@@ -116,7 +116,7 @@ func (s *State) Star(w http.ResponseWriter, r *http.Request) {
 
 		s.notifier.DeleteStar(r.Context(), star)
 
-		s.pages.RepoActionsFragment(w, pages.RepoActionsFragmentParams{
+		s.pages.RepoStarFragment(w, pages.RepoStarFragmentParams{
 			IsStarred: false,
 			RepoAt:    subjectUri,
 			Stats: db.RepoStats{