diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index a4466a06d8..59ee9c7ad6 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -8,7 +8,7 @@
 {{$hasAndShowTreeSidebar := and $hasTreeSidebar $showTreeSidebar}}
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}
-	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
+	<div class="ui container {{if or $hasTreeSidebar .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
 
 		{{if .Repository.IsArchived}}
diff --git a/templates/repo/view_file_tree_sidebar.tmpl b/templates/repo/view_file_tree_sidebar.tmpl
index 26d53554e6..6537fa114b 100644
--- a/templates/repo/view_file_tree_sidebar.tmpl
+++ b/templates/repo/view_file_tree_sidebar.tmpl
@@ -1,3 +1,10 @@
+{{$branchDropdownCurrentRefType := "branch"}}
+{{$branchDropdownCurrentRefShortName := .BranchName}}
+{{if .IsViewTag}}
+	{{$branchDropdownCurrentRefType = "tag"}}
+	{{$branchDropdownCurrentRefShortName = .TagName}}
+{{end}}
+
 <div class="view-file-tree-sidebar-top">
 	<div class="sidebar-header">
 		<button class="hide-tree-sidebar-button ui compact basic button icon" title="{{ctx.Locale.Tr "repo.diff.hide_file_tree"}}">
@@ -6,12 +13,6 @@
 		<b> Files</b>
 	</div>
 	<div class="sidebar-ref">
-		{{$branchDropdownCurrentRefType := "branch"}}
-		{{$branchDropdownCurrentRefShortName := .BranchName}}
-		{{if .IsViewTag}}
-			{{$branchDropdownCurrentRefType = "tag"}}
-			{{$branchDropdownCurrentRefShortName = .TagName}}
-		{{end}}
 		{{template "repo/branch_dropdown" dict
 			"Repository" .Repository
 			"ShowTabBranches" true
@@ -59,5 +60,10 @@
 	</div>
 </div>
 <div class="view-file-tree-sidebar-bottom">
-	<div id="view-file-tree" class="is-loading" data-api-base-url="{{.RepoLink}}" data-tree-path="{{$.TreePath}}"></div>
+	<div id="view-file-tree" class="is-loading"
+		data-api-base-url="{{.RepoLink}}"
+		data-tree-path="{{$.TreePath}}"
+		data-current-ref-type="{{$branchDropdownCurrentRefType}}"
+		data-current-ref-short-name="{{$branchDropdownCurrentRefShortName}}"
+	></div>
 </div>
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 78fa83c7ac..1e4bf6f66e 100644
--- a/web_src/js/features/repo-view-file-tree-sidebar.ts
+++ b/web_src/js/features/repo-view-file-tree-sidebar.ts
@@ -29,9 +29,11 @@ async function toggleSidebar(visibility) {
 }
 
 async function loadChildren(item, recursive?: boolean) {
-  const el = document.querySelector('#view-file-tree');
-  const apiBaseUrl = el.getAttribute('data-api-base-url');
-  const response = await GET(`${apiBaseUrl}/tree/${item ? item.path : ''}?ref=&recursive=${recursive ?? false}`);
+  const fileTree = document.querySelector('#view-file-tree');
+  const apiBaseUrl = fileTree.getAttribute('data-api-base-url');
+  const refType = fileTree.getAttribute('data-current-ref-type');
+  const refName = fileTree.getAttribute('data-current-ref-short-name');
+  const response = await GET(`${apiBaseUrl}/tree/${item ? item.path : ''}?ref=${refType}/${refName}&recursive=${recursive ?? false}`);
   const json = await response.json();
   if (json instanceof Array) {
     return json.map((i) => ({
@@ -64,15 +66,18 @@ export async function initViewFileTreeSidebar() {
   });
 
   const fileTree = document.querySelector('#view-file-tree');
+  const baseUrl = fileTree.getAttribute('data-api-base-url');
   const treePath = fileTree.getAttribute('data-tree-path');
-  const basePath = window.location.href.replace(treePath, '');
+  const refType = fileTree.getAttribute('data-current-ref-type');
+  const refName = fileTree.getAttribute('data-current-ref-short-name');
+
   const selectedItem = ref(treePath);
 
   const files = await loadChildren({path: treePath}, true);
 
   fileTree.classList.remove('is-loading');
   const fileTreeView = createApp(ViewFileTree, {files, selectedItem, loadChildren, loadContent: (item) => {
-    window.history.pushState(null, null, `${basePath}${item.path}`);
+    window.history.pushState(null, null, `${baseUrl}/src/${refType}/${refName}/${item.path}`);
     selectedItem.value = item.path;
     loadContent(item);
   }});