diff --git a/templates/repo/home_branch_dropdown.tmpl b/templates/repo/home_branch_dropdown.tmpl
index f720100c7d..cef3b4bdf2 100644
--- a/templates/repo/home_branch_dropdown.tmpl
+++ b/templates/repo/home_branch_dropdown.tmpl
@@ -5,7 +5,7 @@
 	"CurrentRefType" .ctxData.RefFullName.RefType
 	"CurrentRefShortName" .ctxData.RefFullName.ShortName
 	"CurrentTreePath" .ctxData.TreePath
-	"RefLinkTemplate" "{RepoLink}/src/{RefTypeNameSubURL}/{TreePath}"
+	"RefLinkTemplate" "{RepoLink}/src/{RefType}/{RefShortName}/{TreePath}"
 	"AllowCreateNewRef" .ctxData.CanCreateBranch
 	"ShowViewAllRefsEntry" true
 	"ContainerClasses" .containerClasses
diff --git a/web_src/js/features/common-button.ts b/web_src/js/features/common-button.ts
index c0cd8ee359..781d096e5a 100644
--- a/web_src/js/features/common-button.ts
+++ b/web_src/js/features/common-button.ts
@@ -155,15 +155,15 @@ function onShowModalClick(e) {
 }
 
 export function initGlobalButtons(): void {
-  initTargetButtons(document as ParentNode);
-}
-
-export function initTargetButtons(target: ParentNode): void {
   // There are many "cancel button" elements in modal dialogs, Fomantic UI expects they are button-like elements but never submit a form.
   // However, Gitea misuses the modal dialog and put the cancel buttons inside forms, so we must prevent the form submission.
   // There are a few cancel buttons in non-modal forms, and there are some dynamically created forms (eg: the "Edit Issue Content")
-  queryElems(target, 'form button.ui.cancel.button', (el) => el.addEventListener('click', (e) => e.preventDefault()));
+  addDelegatedEventListener(document, 'click', 'form button.ui.cancel.button', (_ /* el */, e) => e.preventDefault());
 
+  initTargetButtons(document);
+}
+
+export function initTargetButtons(target: ParentNode): void {
   queryElems(target, '.show-panel', (el) => el.addEventListener('click', onShowPanelClick));
   queryElems(target, '.hide-panel', (el) => el.addEventListener('click', onHidePanelClick));
   queryElems(target, '.show-modal', (el) => el.addEventListener('click', onShowModalClick));