diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 7e16dd6549..290e80064c 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -19,7 +19,7 @@
 
 		<div class="{{Iif $showSidebar "repo-grid-filelist-sidebar" (Iif .RepoPreferences.ShowFileViewTreeSidebar "repo-grid-tree-sidebar" "repo-grid-filelist-only")}}">
 			{{if .TreeNames}}
-				<div class="repo-view-file-tree-sidebar not-mobile {{if not .RepoPreferences.ShowFileViewTreeSidebar}}tw-hidden{{end}}" data-global-init="initViewFileTreeSidebar" {{if .IsSigned}} data-is-signed {{end}}>{{template "repo/view_file_tree_sidebar" .}}</div>
+				<div class="repo-view-file-tree-sidebar not-mobile {{if not .RepoPreferences.ShowFileViewTreeSidebar}}tw-hidden{{end}}" {{if .IsSigned}} data-is-signed {{end}}>{{template "repo/view_file_tree_sidebar" .}}</div>
 			{{end}}
 
 			<div class="repo-home-filelist">
diff --git a/web_src/js/features/repo-view-file-tree-sidebar.ts b/web_src/js/features/repo-view-file-tree-sidebar.ts
index dd1e8d6b4a..246a8b40ca 100644
--- a/web_src/js/features/repo-view-file-tree-sidebar.ts
+++ b/web_src/js/features/repo-view-file-tree-sidebar.ts
@@ -1,7 +1,6 @@
 import {createApp, ref} from 'vue';
 import {toggleElem} from '../utils/dom.ts';
 import {GET, PUT} from '../modules/fetch.ts';
-import {registerGlobalInitFunc} from '../modules/observer.ts';
 import ViewFileTree from '../components/ViewFileTree.vue';
 
 async function toggleSidebar(sidebarEl: HTMLElement, visibility: boolean) {
@@ -58,42 +57,39 @@ function reloadContentScript(sidebarEl: HTMLElement, contentEl: Element) {
   });
 }
 
-export function initViewFileTreeSidebar() {
-  let popstateListenerForViewFilePageAdded = false;
-  registerGlobalInitFunc('initViewFileTreeSidebar', async (el: HTMLElement) => {
-    el.querySelector('.hide-tree-sidebar-button').addEventListener('click', () => {
-      toggleSidebar(el, false);
-    });
-    el.parentElement.querySelector('.repo-home-filelist .show-tree-sidebar-button').addEventListener('click', () => {
-      toggleSidebar(el, true);
-    });
+export async function initViewFileTreeSidebar() {
+  const sidebarEl = document.querySelector('.repo-view-file-tree-sidebar');
+  if (!sidebarEl || !(sidebarEl instanceof HTMLElement)) return;
 
-    const fileTree = el.querySelector('#view-file-tree');
-    const baseUrl = fileTree.getAttribute('data-api-base-url');
-    const treePath = fileTree.getAttribute('data-tree-path');
-    const refType = fileTree.getAttribute('data-current-ref-type');
-    const refName = fileTree.getAttribute('data-current-ref-short-name');
-    const refString = (refType ? (`/${refType}`) : '') + (refName ? (`/${refName}`) : '');
+  sidebarEl.querySelector('.hide-tree-sidebar-button').addEventListener('click', () => {
+    toggleSidebar(sidebarEl, false);
+  });
+  sidebarEl.parentElement.querySelector('.repo-home-filelist .show-tree-sidebar-button').addEventListener('click', () => {
+    toggleSidebar(sidebarEl, true);
+  });
 
-    const selectedItem = ref(getSelectedPath(refString));
+  const fileTree = sidebarEl.querySelector('#view-file-tree');
+  const baseUrl = fileTree.getAttribute('data-api-base-url');
+  const treePath = fileTree.getAttribute('data-tree-path');
+  const refType = fileTree.getAttribute('data-current-ref-type');
+  const refName = fileTree.getAttribute('data-current-ref-short-name');
+  const refString = (refType ? (`/${refType}`) : '') + (refName ? (`/${refName}`) : '');
 
-    const files = await childrenLoader(el)(treePath, true);
+  const selectedItem = ref(getSelectedPath(refString));
 
-    fileTree.classList.remove('is-loading');
-    const fileTreeView = createApp(ViewFileTree, {files, selectedItem, loadChildren: childrenLoader(el), loadContent: (path: string) => {
-      window.history.pushState(null, null, encodeURI(`${baseUrl}/src${refString}/${path}`));
-      selectedItem.value = path;
-      loadContent(el);
-    }});
-    fileTreeView.mount(fileTree);
+  const files = await childrenLoader(sidebarEl)(treePath, true);
 
-    if (!popstateListenerForViewFilePageAdded) {
-      window.addEventListener('popstate', () => {
-        selectedItem.value = getSelectedPath(refString);
-        loadContent(el);
-      });
-      popstateListenerForViewFilePageAdded = true;
-    }
+  fileTree.classList.remove('is-loading');
+  const fileTreeView = createApp(ViewFileTree, {files, selectedItem, loadChildren: childrenLoader(sidebarEl), loadContent: (path: string) => {
+    window.history.pushState(null, null, encodeURI(`${baseUrl}/src${refString}/${path}`));
+    selectedItem.value = path;
+    loadContent(sidebarEl);
+  }});
+  fileTreeView.mount(fileTree);
+
+  window.addEventListener('popstate', () => {
+    selectedItem.value = getSelectedPath(refString);
+    loadContent(sidebarEl);
   });
 }