diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 803627060e..fa553fba96 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -9,7 +9,7 @@
 			<img src="{{.Poster.RelAvatarLink}}">
 		</a>
 	{{end}}
-	<div class="content">
+	<div class="content comment-container">
 		<div class="ui top attached header comment-header df ac sb">
 			<div class="comment-header-left df ac">
 				{{if .OriginalAuthor }}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 1dadd2ef96..81e2c80c3c 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -19,7 +19,7 @@
 					<img src="{{.Issue.Poster.RelAvatarLink}}">
 				</a>
 			{{end}}
-				<div class="content">
+				<div class="content comment-container">
 					<div class="ui top attached header comment-header df ac sb">
 						<div class="comment-header-left df ac">
 							{{if .Issue.OriginalAuthor }}
diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index c814932d14..6f18980072 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -18,7 +18,7 @@
 				<img src="{{.Poster.RelAvatarLink}}">
 			</a>
 		{{end}}
-			<div class="content">
+			<div class="content comment-container">
 				<div class="ui top attached header comment-header df ac sb">
 					<div class="comment-header-left df ac">
 						{{if .OriginalAuthor }}
@@ -427,8 +427,8 @@
 			</div>
 			{{if .Content}}
 			<div class="timeline-item comment">
-				<div class="content">
-					<div class="ui top attached header arrow-top">
+				<div class="content comment-container">
+					<div class="ui top attached header comment-header df ac sb">
 						<span class="text grey">
 							{{if .OriginalAuthor }}
 								<span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index d3190f222d..9b4383c145 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -997,7 +997,7 @@
           }
         }
 
-        .content {
+        .comment-container {
           border: 1px solid var(--color-secondary);
           border-radius: var(--border-radius);
 
@@ -2791,7 +2791,7 @@
   }
 }
 
-.comment:target .content {
+.comment:target .comment-container {
   border-color: var(--color-primary) !important;
   box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important;
 }