diff --git a/routers/repo/compare.go b/routers/repo/compare.go
index fb6076cbe..aa4b3191b 100644
--- a/routers/repo/compare.go
+++ b/routers/repo/compare.go
@@ -184,6 +184,7 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *
 	ctx.Data["BaseIsCommit"] = baseIsCommit
 	ctx.Data["BaseIsBranch"] = baseIsBranch
 	ctx.Data["BaseIsTag"] = baseIsTag
+	ctx.Data["IsPull"] = true
 
 	// Now we have the repository that represents the base
 
diff --git a/templates/repo/issue/labels/label.tmpl b/templates/repo/issue/labels/label.tmpl
new file mode 100644
index 000000000..d76dc6af7
--- /dev/null
+++ b/templates/repo/issue/labels/label.tmpl
@@ -0,0 +1,9 @@
+<a
+	class="ui label item {{if not .label.IsChecked}}hide{{end}}"
+	id="label_{{.label.ID}}"
+	href="{{.root.RepoLink}}/{{if or .root.IsPull .root.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.label.ID}}"
+	style="color: {{.label.ForegroundColor}}; background-color: {{.label.Color}}"
+	title="{{.label.Description | RenderEmojiPlain}}"
+>
+		{{.label.Name | RenderEmoji}}
+</a>
diff --git a/templates/repo/issue/labels/labels_sidebar.tmpl b/templates/repo/issue/labels/labels_sidebar.tmpl
new file mode 100644
index 000000000..bf6f98c88
--- /dev/null
+++ b/templates/repo/issue/labels/labels_sidebar.tmpl
@@ -0,0 +1,9 @@
+<div class="ui labels list">
+	<span class="no-select item {{if .ctx.HasSelectedLabel}}hide{{end}}">{{.ctx.i18n.Tr "repo.issues.new.no_label"}}</span>
+	{{range .ctx.Labels}}
+		{{template "repo/issue/labels/label" dict "root" $ "label" .}}
+	{{end}}
+	{{range .ctx.OrgLabels}}
+		{{template "repo/issue/labels/label" dict "root" $ "label" .}}
+	{{end}}
+</div>
diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index e585fc735..73a3851e1 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -70,19 +70,7 @@
 					{{end}}
 				</div>
 			</div>
-			<div class="ui labels list">
-				<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
-				{{range .Labels}}
-					{{if .IsChecked}}
-						<a class="item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmoji}}</span></a>
-					{{end}}
-				{{end}}
-				{{range .OrgLabels}}
-					{{if .IsChecked}}
-						<a class="item" id="label_{{.ID}}" href="/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name | RenderEmoji}}</span></a>
-					{{end}}
-				{{end}}
-			</div>
+			{{template "repo/issue/labels/labels_sidebar" dict "root" $ "ctx" .}}
 
 			<div class="ui divider"></div>
 
diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index 21c7a9d36..55a625ec5 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -125,25 +125,7 @@
 				{{end}}
 			</div>
 		</div>
-		<div class="ui labels list">
-			{{if not .HasSelectedLabel}}
-				<span class="no-select item">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
-			{{end}}
-			{{range .Labels}}
-				{{if .IsChecked}}
-					<div class="item">
-						<a class="ui label" id="label_{{.ID}}" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
-					</div>
-				{{end}}
-			{{end}}
-			{{range .OrgLabels}}
-				{{if .IsChecked}}
-					<div class="item">
-						<a class="ui label" id="label_{{.ID}}" href="{{$.RepoLink}}/{{if $.Issue.IsPull}}pulls{{else}}issues{{end}}?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description | RenderEmojiPlain}}">{{.Name | RenderEmoji}}</a>
-					</div>
-				{{end}}
-			{{end}}
-		</div>
+		{{template "repo/issue/labels/labels_sidebar" dict "root" $ "ctx" .}}
 
 		<div class="ui divider"></div>
 
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index ab5ef21ee..3058ec0cc 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -133,11 +133,6 @@
           max-width: 100px;
         }
       }
-
-      .label.color {
-        padding: 0 8px;
-        margin-right: 5px;
-      }
     }
 
     #deadlineForm input {
@@ -2985,12 +2980,14 @@
 }
 
 .labels.list .item {
-  padding: 0 !important;
-  margin-bottom: 2px;
+  padding: .3em .5em !important;
+  margin-left: 0;
+  margin-right: 0;
+  margin-bottom: 3px;
 }
 
 .labels.list .item + .item {
-  margin-left: 2px;
+  margin-left: 3px;
 }
 
 tbody.commit-list {