diff --git a/appview/pages/templates/layouts/topbar.html b/appview/pages/templates/layouts/topbar.html
index 50d9ed93..d2db8453 100644
--- a/appview/pages/templates/layouts/topbar.html
+++ b/appview/pages/templates/layouts/topbar.html
@@ -36,14 +36,15 @@
 {{ define "dropDown" }}
 <details class="relative inline-block text-left">
     <summary
-        class="cursor-pointer list-none"
+        class="cursor-pointer list-none flex items-center"
     >
-        {{ didOrHandle .Did .Handle }}
+        {{ $user := didOrHandle .Did .Handle }}
+        {{ template "user/fragments/picHandle" $user }}
     </summary>
     <div
         class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700"
     >
-        <a href="/{{ didOrHandle .Did .Handle }}">profile</a>
+        <a href="/{{ $user }}">profile</a>
         <a href="/knots">knots</a>
         <a href="/spindles">spindles</a>
         <a href="/settings">settings</a>
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index c2e916be..37094630 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -33,7 +33,7 @@
             <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">
                 opened by
                 {{ $owner := didOrHandle .Issue.OwnerDid .IssueOwnerHandle }}
-                {{ template "user/fragments/picHandle" $owner }}
+                {{ template "user/fragments/picHandleLink" $owner }}
                <span class="select-none before:content-['\00B7']"></span>
                 <time title="{{ .Issue.Created | longTimeFmt }}">
                     {{ .Issue.Created | timeFmt }}
diff --git a/appview/pages/templates/repo/issues/issues.html b/appview/pages/templates/repo/issues/issues.html
index 1501159e..8087888d 100644
--- a/appview/pages/templates/repo/issues/issues.html
+++ b/appview/pages/templates/repo/issues/issues.html
@@ -66,7 +66,7 @@
 
       <span class="ml-1">
           {{ $owner := index $.DidHandleMap .OwnerDid }}
-          {{ template "user/fragments/picHandle" $owner }}
+          {{ template "user/fragments/picHandleLink" $owner }}
       </span>
 
       <span class="before:content-['·']">
diff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
index 87f49b5e..1bcedfcd 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
@@ -29,7 +29,7 @@
         <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">
             opened by
             {{ $owner := index $.DidHandleMap .Pull.OwnerDid }}
-            {{ template "user/fragments/picHandle" $owner }}
+            {{ template "user/fragments/picHandleLink" $owner }}
             <span class="select-none before:content-['\00B7']"></span>
             <time>{{ .Pull.Created | timeFmt }}</time>
 
diff --git a/appview/pages/templates/repo/pulls/pulls.html b/appview/pages/templates/repo/pulls/pulls.html
index 2c460701..95fe805d 100644
--- a/appview/pages/templates/repo/pulls/pulls.html
+++ b/appview/pages/templates/repo/pulls/pulls.html
@@ -76,7 +76,7 @@
                     </span>
 
                     <span class="ml-1">
-                        {{ template "user/fragments/picHandle" $owner }}
+                        {{ template "user/fragments/picHandleLink" $owner }}
                     </span>
 
                     <span>
diff --git a/appview/pages/templates/timeline.html b/appview/pages/templates/timeline.html
index 06281ed1..2aa16f75 100644
--- a/appview/pages/templates/timeline.html
+++ b/appview/pages/templates/timeline.html
@@ -61,7 +61,7 @@
                         {{ $userHandle :=  index $.DidHandleMap .Repo.Did }}
                         <div class="flex items-center">
                             <p class="text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2">
-                                {{ template "user/fragments/picHandle" $userHandle }}
+                                {{ template "user/fragments/picHandleLink" $userHandle }}
                                 {{ if .Source }}
                                     forked
                                     <a
@@ -95,9 +95,9 @@
                         {{ $subjectHandle :=  index $.DidHandleMap .Follow.SubjectDid }}
                         <div class="flex items-center">
                             <p class="text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2">
-                                {{ template "user/fragments/picHandle" $userHandle }}
+                                {{ template "user/fragments/picHandleLink" $userHandle }}
                                 followed
-                                {{ template "user/fragments/picHandle" $subjectHandle }}
+                                {{ template "user/fragments/picHandleLink" $subjectHandle }}
                                 <time
                                     class="text-gray-700 dark:text-gray-400 text-xs"
                                     >{{ .Follow.FollowedAt | timeFmt }}</time
@@ -109,7 +109,7 @@
                         {{ $repoOwnerHandle :=  index $.DidHandleMap .Star.Repo.Did }}
                         <div class="flex items-center">
                             <p class="text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2">
-                                {{ template "user/fragments/picHandle" $starrerHandle }}
+                                {{ template "user/fragments/picHandleLink" $starrerHandle }}
                                 starred
                                 <a
                                     href="/{{ $repoOwnerHandle }}/{{ .Star.Repo.Name }}"
diff --git a/appview/pages/templates/user/fragments/picHandle.html b/appview/pages/templates/user/fragments/picHandle.html
index a1c10853..55187d7b 100644
--- a/appview/pages/templates/user/fragments/picHandle.html
+++ b/appview/pages/templates/user/fragments/picHandle.html
@@ -1,10 +1,8 @@
 {{ define "user/fragments/picHandle" }}
-<a href="/{{ . }}" class="flex items-center">
-    <img
-        src="{{ tinyAvatar . }}"
-        alt="{{ . }}"
-        class="rounded-full h-6 w-6 mr-1 border border-gray-300 dark:border-gray-700"
-    />
-    {{ . | truncateAt30 }}
-</a>
+<img
+    src="{{ tinyAvatar . }}"
+    alt="{{ . }}"
+    class="rounded-full h-6 w-6 mr-1 border border-gray-300 dark:border-gray-700"
+/>
+{{ . | truncateAt30 }}
 {{ end }}
diff --git a/appview/pages/templates/user/fragments/picHandleLink.html b/appview/pages/templates/user/fragments/picHandleLink.html
new file mode 100644
index 00000000..5eab166d
--- /dev/null
+++ b/appview/pages/templates/user/fragments/picHandleLink.html
@@ -0,0 +1,5 @@
+{{ define "user/fragments/picHandleLink" }}
+<a href="/{{ . }}" class="flex items-center">
+    {{ template "user/fragments/picHandle" . }}
+</a>
+{{ end }}