diff --git a/routers/web/repo/issue_watch.go b/routers/web/repo/issue_watch.go
index 8b033f3b17..c8d7187b8e 100644
--- a/routers/web/repo/issue_watch.go
+++ b/routers/web/repo/issue_watch.go
@@ -14,7 +14,7 @@ import (
 )
 
 const (
-	tplWatching base.TplName = "repo/issue/view_content/watching"
+	tplWatching base.TplName = "repo/issue/view_content/sidebar/watching"
 )
 
 // IssueWatch sets issue watching
diff --git a/templates/repo/issue/view_content/sidebar/watch.tmpl b/templates/repo/issue/view_content/sidebar/watch.tmpl
index 6c74b140c8..ee14168070 100644
--- a/templates/repo/issue/view_content/sidebar/watch.tmpl
+++ b/templates/repo/issue/view_content/sidebar/watch.tmpl
@@ -1,17 +1,6 @@
 <div class="ui watching">
 	<span class="text"><strong>{{ctx.Locale.Tr "notification.notifications"}}</strong></span>
 	<div class="tw-mt-2">
-		<form hx-boost="true" hx-sync="this:replace" hx-target="this" method="post" action="{{.Issue.Link}}/watch">
-			<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}">
-			<button class="fluid ui button">
-				{{if $.IssueWatch.IsWatching}}
-					{{svg "octicon-mute" 16 "tw-mr-2"}}
-					{{ctx.Locale.Tr "repo.issues.unsubscribe"}}
-				{{else}}
-					{{svg "octicon-unmute" 16 "tw-mr-2"}}
-					{{ctx.Locale.Tr "repo.issues.subscribe"}}
-				{{end}}
-			</button>
-		</form>
+		{{template "repo/issue/view_content/sidebar/watching" .}}
 	</div>
 </div>
diff --git a/templates/repo/issue/view_content/sidebar/watching.tmpl b/templates/repo/issue/view_content/sidebar/watching.tmpl
new file mode 100644
index 0000000000..05936d090b
--- /dev/null
+++ b/templates/repo/issue/view_content/sidebar/watching.tmpl
@@ -0,0 +1,12 @@
+<form hx-boost="true" hx-sync="this:replace" hx-target="this" method="post" action="{{.Issue.Link}}/watch">
+	<input type="hidden" name="watch" value="{{if $.IssueWatch.IsWatching}}0{{else}}1{{end}}">
+	<button class="fluid ui button">
+		{{if $.IssueWatch.IsWatching}}
+			{{svg "octicon-mute" 16 "tw-mr-2"}}
+			{{ctx.Locale.Tr "repo.issues.unsubscribe"}}
+		{{else}}
+			{{svg "octicon-unmute" 16 "tw-mr-2"}}
+			{{ctx.Locale.Tr "repo.issues.subscribe"}}
+		{{end}}
+	</button>
+</form>