diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 07e8a39dfe6..a3e9ad3bf9a 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -957,7 +957,7 @@ func ExcerptBlob(ctx *context.Context) {
 		}
 		lineCommits := allComments[filePath]
 		for _, line := range section.Lines {
-			if line.SectionInfo != nil {
+			if line.SectionInfo != nil && line.SectionInfo.RightHunkSize > 0 {
 				start := int64(line.SectionInfo.LastRightIdx + 1)
 				end := int64(line.SectionInfo.RightIdx - 1)
 				for start <= end {
diff --git a/services/gitdiff/gitdiff.go b/services/gitdiff/gitdiff.go
index 9dedf618b15..4b253e0eb66 100644
--- a/services/gitdiff/gitdiff.go
+++ b/services/gitdiff/gitdiff.go
@@ -482,7 +482,7 @@ func (diff *Diff) LoadComments(ctx context.Context, issue *issues_model.Issue, c
 		if lineCommits, ok := allComments[file.Name]; ok {
 			for _, section := range file.Sections {
 				for _, line := range section.Lines {
-					if line.SectionInfo != nil {
+					if line.SectionInfo != nil && line.SectionInfo.RightHunkSize > 0 {
 						start := int64(line.SectionInfo.LastRightIdx + 1)
 						end := int64(line.SectionInfo.RightIdx - 1)
 						for start <= end {
diff --git a/templates/repo/diff/blob_excerpt.tmpl b/templates/repo/diff/blob_excerpt.tmpl
index 10601fa5766..72a1e786a33 100644
--- a/templates/repo/diff/blob_excerpt.tmpl
+++ b/templates/repo/diff/blob_excerpt.tmpl
@@ -8,7 +8,7 @@
 				<div class="lines-comment">
 					<div>
 						{{if $line.SectionInfo.HasComments}}
-							<button>
+							<button class="section-comment-icon">
 								{{svg "octicon-comment-discussion"}}
 							</button>
 						{{end}}
@@ -81,7 +81,7 @@
 				<div class="lines-comment">
 					<div>
 						{{if $line.SectionInfo.HasComments}}
-							<button>
+							<button class="section-comment-icon">
 								{{svg "octicon-comment-discussion"}}
 							</button>
 						{{end}}
diff --git a/templates/repo/diff/section_split.tmpl b/templates/repo/diff/section_split.tmpl
index b245884536a..ce1f626d905 100644
--- a/templates/repo/diff/section_split.tmpl
+++ b/templates/repo/diff/section_split.tmpl
@@ -22,7 +22,7 @@
 						<div class="lines-comment">
 							<div>
 								{{if $line.SectionInfo.HasComments}}
-									<button>
+									<button class="section-comment-icon">
 										{{svg "octicon-comment-discussion"}}
 									</button>
 								{{end}}
diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl
index fe1a6d0faf4..8ca2c8cc4f8 100644
--- a/templates/repo/diff/section_unified.tmpl
+++ b/templates/repo/diff/section_unified.tmpl
@@ -18,7 +18,7 @@
 						<div class="lines-comment">
 							<div>
 								{{if $line.SectionInfo.HasComments}}
-									<button>
+									<button class="section-comment-icon">
 										{{svg "octicon-comment-discussion"}}
 									</button>
 								{{end}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index ebb41bde856..c31dfd05bde 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1148,6 +1148,10 @@ overflow-menu .ui.label {
   gap: 1px;
 }
 
+.section-comment-icon {
+  cursor: default;
+}
+
 .lines-commit .blame-info .blame-data .blame-message {
   flex-grow: 2;
   overflow: hidden;