diff --git a/templates/repo/issue/view_content/sidebar/dependencies.tmpl b/templates/repo/issue/view_content/sidebar/dependencies.tmpl
index 7267e39d6a..1b7fcaa846 100644
--- a/templates/repo/issue/view_content/sidebar/dependencies.tmpl
+++ b/templates/repo/issue/view_content/sidebar/dependencies.tmpl
@@ -1,4 +1,4 @@
-<div class="ui depending">
+<div class="ui form depending">
 	{{if (and (not .BlockedByDependencies) (not .BlockedByDependenciesNotPermitted) (not .BlockingDependencies) (not .BlockingDependenciesNotPermitted))}}
 		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.dependency.title"}}</strong></span>
 		<br>
diff --git a/templates/repo/issue/view_content/sidebar/reference.tmpl b/templates/repo/issue/view_content/sidebar/reference.tmpl
index 1b02769ad1..c164b1e864 100644
--- a/templates/repo/issue/view_content/sidebar/reference.tmpl
+++ b/templates/repo/issue/view_content/sidebar/reference.tmpl
@@ -1,4 +1,4 @@
-<div class="ui reference">
+<div class="ui form reference">
 	{{$issueReferenceLink := ""}}
 	{{if .Issue.IsPull}}
 		{{$issueReferenceLink = printf "%s!%d" .Issue.Repo.FullName .Issue.Index}}
@@ -10,10 +10,12 @@
 			{{ctx.Locale.Tr "discussion.sidebar.reference"}}
 		</strong>
 	</span>
-	<div class="ui equal width compact grid">
-		<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
-			<span class="text column truncate">{{$issueReferenceLink}}</span>
-			<button class="ui two wide button column tw-p-2" data-tooltip-content="{{ctx.Locale.Tr "copy"}}" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
+	<p>
+		<div class="ui equal width compact grid">
+			<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
+				<span class="text column truncate">{{$issueReferenceLink}}</span>
+				<button class="ui two wide button column tw-p-2" data-tooltip-content="{{ctx.Locale.Tr "copy"}}" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
+			</div>
 		</div>
-	</div>
+	</p>
 </div>
diff --git a/templates/repo/issue/view_content/sidebar/timetracking.tmpl b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
index 228e2d27a7..77bd271381 100644
--- a/templates/repo/issue/view_content/sidebar/timetracking.tmpl
+++ b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
@@ -51,20 +51,22 @@
 	<div class="divider"></div>
 	<div class="ui comments">
 		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time)}}</strong></span>
-		<div>
-			{{range $user, $trackedtime := .WorkingUsers}}
-				<div class="comment tw-mt-2">
-					<a class="avatar">
-						{{ctx.AvatarUtils.Avatar $user}}
-					</a>
-					<div class="content">
-						{{template "shared/user/authorlink" $user}}
-						<div class="text">
-							{{$trackedtime|Sec2Time}}
+		<p>
+			<div>
+				{{range $user, $trackedtime := .WorkingUsers}}
+					<div class="comment tw-mt-2">
+						<a class="avatar">
+							{{ctx.AvatarUtils.Avatar $user}}
+						</a>
+						<div class="content">
+							{{template "shared/user/authorlink" $user}}
+							<div class="text">
+								{{$trackedtime|Sec2Time}}
+							</div>
 						</div>
 					</div>
-				</div>
-			{{end}}
-		</div>
+				{{end}}
+			</div>
+		</p>
 	</div>
 {{end}}