diff --git a/appview/pages/templates/repo/blob.html b/appview/pages/templates/repo/blob.html
--- a/appview/pages/templates/repo/blob.html
+++ b/appview/pages/templates/repo/blob.html
@@ -162,5 +162,7 @@
         showWrapContentToggleOnOverflow();
       })();
     </script>
-    {{ template "repo/fragments/permalinkShortcut" . }}
+    {{ if .LastCommitInfo }}
+      {{ template "repo/fragments/permalinkShortcutScript" (printf "/%s/tree/%s/%s" .RepoInfo.RepoIdentifier .LastCommitInfo.Hash .Path) }}
+    {{ end }}
 {{ end }}
diff --git a/appview/pages/templates/repo/tree.html b/appview/pages/templates/repo/tree.html
--- a/appview/pages/templates/repo/tree.html
+++ b/appview/pages/templates/repo/tree.html
@@ -99,7 +99,9 @@
 
   </div>
 </main>
-{{ template "repo/fragments/permalinkShortcut" . }}
+{{ if .LastCommitInfo }}
+  {{ template "repo/fragments/permalinkShortcutScript" (printf "/%s/tree/%s/%s" .RepoInfo.RepoIdentifier .LastCommitInfo.Hash .Path) }}
+{{ end }}
 {{end}}
 
 {{ define "repoAfter" }}
diff --git a/appview/pages/templates/repo/fragments/permalinkShortcut.html b/appview/pages/templates/repo/fragments/permalinkShortcut.html
--- a/appview/pages/templates/repo/fragments/permalinkShortcut.html
+++ b/appview/pages/templates/repo/fragments/permalinkShortcut.html
@@ -1,13 +1,13 @@
-{{ define "repo/fragments/permalinkShortcut" }}
+{{ define "repo/fragments/permalinkShortcutScript" }}
+  {{ $path := . }}
   <script>
     (() => {
-      {{ if .LastCommitInfo }}
       const abortController = new AbortController();
       const scriptEl = document.currentScript;
       document.addEventListener('keydown', (e) => {
         if(e.key === 'y' && !e.ctrlKey && !e.metaKey && !e.altKey) {
           if(e.target.tagName === 'INPUT' || e.target.tagName === 'TEXTAREA') return;
-          const permalinkUrl = '/{{ .RepoInfo.RepoIdentifier }}/tree/{{ .LastCommitInfo.Hash }}/{{ .Path }}' + window.location.hash;
+          const permalinkUrl = '{{ $path }}' + window.location.hash;
           window.location.href = permalinkUrl;
         }
       }, {signal: abortController.signal});
@@ -17,7 +17,6 @@
           abortController.abort();
         }
       }, {signal: abortController.signal});
-      {{ end }}
     })();
   </script>
 {{ end }}