diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index 00c3d880a9..f27ad62982 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -211,6 +211,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
 	ctx.Data["TreeNames"] = treeNames
 	ctx.Data["TreePaths"] = treePaths
 	ctx.Data["BranchLink"] = ctx.Repo.RepoLink + "/src/" + ctx.Repo.BranchNameSubURL()
+	ctx.Data["BranchPath"] = ctx.Repo.BranchNameSubURL()
 	ctx.Data["commit_summary"] = ""
 	ctx.Data["commit_message"] = ""
 	if canCommit {
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 71cecf1514..7b750b1e27 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -28,7 +28,7 @@
 			<div class="field">
 				<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
 					<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
-					<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
+					<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL}}" data-branch-path="{{.BranchNameSubURL}}" data-relative-path="{{.Repository.Link}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
 					{{if not .IsNewFile}}
 					<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
 					{{end}}
diff --git a/web_src/js/features/repo-editor.js b/web_src/js/features/repo-editor.js
index ff78b13cf7..95035de5d1 100644
--- a/web_src/js/features/repo-editor.js
+++ b/web_src/js/features/repo-editor.js
@@ -23,20 +23,11 @@ function initEditPreviewTab($form) {
       }
       context = context.substring(0, context.lastIndexOf('/'));
 
-      // fetch branch path, Eg: `/branch/main`
-      const pathSegments = context.split("/").filter(segment => segment !== "");
-      const last2Seg = pathSegments.slice(-2);
-      const branchPath = "/" + last2Seg.join("/")
-      
-      // fetch relative path to the current repository as `/<username>/<repository>`
-      // Eg: `/jon-doe/repo1`
-      const relativePath = context.split("/src"+branchPath)[0]
-      
       const formData = new FormData();
       formData.append('mode', mode);
       formData.append('context', context);
-      formData.append('branch_path', branchPath)
-      formData.append('relative_path', relativePath)
+      formData.append('branch_path', $this.data('branch-path'))
+      formData.append('relative_path', $this.data('relative-path'))
       formData.append(
         'text',
         $form.find(`.tab[data-tab="${$tabMenu.data('write')}"] textarea`).val(),