diff --git a/templates/repo/view_content.tmpl b/templates/repo/view_content.tmpl
index 3ba04a9974..f1cc811847 100644
--- a/templates/repo/view_content.tmpl
+++ b/templates/repo/view_content.tmpl
@@ -1,5 +1,6 @@
 {{$isTreePathRoot := not .TreeNames}}
 
+<div class="repo-view-content-data tw-hidden" data-document-title="{{ctx.RootData.Title}}"></div>
 {{template "repo/sub_menu" .}}
 <div class="repo-button-row">
 	<div class="repo-button-row-left">
diff --git a/templates/repo/view_file_tree.tmpl b/templates/repo/view_file_tree.tmpl
index 1e737d09cd..8aed05f346 100644
--- a/templates/repo/view_file_tree.tmpl
+++ b/templates/repo/view_file_tree.tmpl
@@ -10,7 +10,6 @@
 {{/* TODO: Dynamically move components such as refSelector and createPR here */}}
 <div id="view-file-tree" class="tw-overflow-auto tw-h-full is-loading"
 	data-repo-link="{{.RepoLink}}"
-	data-repo-name="{{.Repository.Name}}"
 	data-tree-path="{{$.TreePath}}"
 	data-current-ref-name-sub-url="{{.RefTypeNameSubURL}}"
 ></div>
diff --git a/web_src/js/components/ViewFileTree.vue b/web_src/js/components/ViewFileTree.vue
index 1bd52d7435..1f90f92586 100644
--- a/web_src/js/components/ViewFileTree.vue
+++ b/web_src/js/components/ViewFileTree.vue
@@ -7,7 +7,6 @@ const elRoot = useTemplateRef('elRoot');
 
 const props = defineProps({
   repoLink: {type: String, required: true},
-  repoName: {type: String, required: true},
   treePath: {type: String, required: true},
   currentRefNameSubURL: {type: String, required: true},
 });
diff --git a/web_src/js/components/ViewFileTreeStore.ts b/web_src/js/components/ViewFileTreeStore.ts
index 63b585c743..2e78eb8b8b 100644
--- a/web_src/js/components/ViewFileTreeStore.ts
+++ b/web_src/js/components/ViewFileTreeStore.ts
@@ -4,7 +4,7 @@ import {pathEscapeSegments} from '../utils/url.ts';
 import {createElementFromHTML} from '../utils/dom.ts';
 import {html} from '../utils/html.ts';
 
-export function createViewFileTreeStore(props: {repoLink: string, repoName: string, treePath: string, currentRefNameSubURL: string}) {
+export function createViewFileTreeStore(props: {repoLink: string, treePath: string, currentRefNameSubURL: string}) {
   const store = reactive({
     rootFiles: [],
     selectedItem: props.treePath,
@@ -25,30 +25,24 @@ export function createViewFileTreeStore(props: {repoLink: string, repoName: stri
     },
 
     async loadViewContent(url: string) {
-      url = url.includes('?') ? url.replace('?', '?only_content=true') : `${url}?only_content=true`;
-      const response = await GET(url);
-      document.querySelector('.repo-view-content').innerHTML = await response.text();
+      const u = new URL(url, window.origin);
+      u.searchParams.set('only_content', '1');
+      const response = await GET(u.href);
+      const elViewContent = document.querySelector('.repo-view-content');
+      elViewContent.innerHTML = await response.text();
+      document.title = elViewContent.querySelector('.repo-view-content-data').getAttribute('data-document-title');
     },
 
     async navigateTreeView(treePath: string) {
       const url = store.buildTreePathWebUrl(treePath);
-      const title = store.buildTitle(store.selectedItem, treePath);
       window.history.pushState({treePath, url}, null, url);
       store.selectedItem = treePath;
       await store.loadViewContent(url);
-      document.title = title;
     },
 
     buildTreePathWebUrl(treePath: string) {
       return `${props.repoLink}/src/${props.currentRefNameSubURL}/${pathEscapeSegments(treePath)}`;
     },
-
-    buildTitle(oldTreePath: string, treePath: string) {
-      // the title always starts with "<repoName>/<treePath>"
-      const oldPrefixLength = props.repoName.length + 1 + oldTreePath.length;
-      const titleSuffix = document.title.substring(oldPrefixLength);
-      return `${props.repoName}/${treePath}${titleSuffix}`;
-    },
   });
   return store;
 }
diff --git a/web_src/js/features/repo-view-file-tree.ts b/web_src/js/features/repo-view-file-tree.ts
index 785ec35a5a..f52b64cc51 100644
--- a/web_src/js/features/repo-view-file-tree.ts
+++ b/web_src/js/features/repo-view-file-tree.ts
@@ -31,7 +31,6 @@ export async function initRepoViewFileTree() {
   const fileTree = sidebar.querySelector('#view-file-tree');
   createApp(ViewFileTree, {
     repoLink: fileTree.getAttribute('data-repo-link'),
-    repoName: fileTree.getAttribute('data-repo-name'),
     treePath: fileTree.getAttribute('data-tree-path'),
     currentRefNameSubURL: fileTree.getAttribute('data-current-ref-name-sub-url'),
   }).mount(fileTree);