diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl
index adbe9e1e9e..80714e8db7 100644
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -90,15 +90,11 @@
 				</span>
 				<div class="selected">
 					{{range .Reviewers}}
-						{{if .User}}
-							<a class="item gt-p-2 muted gt-hidden" id="reviewer_{{.ItemID}}" href="#">
-								{{ctx.AvatarUtils.Avatar .User 28 "gt-mr-3 gt-vm"}}{{.User.GetDisplayName}}
-							</a>
-						{{else if .Team}}
-							<a class="item gt-p-2 muted gt-hidden" id="reviewer_{{.ItemID}}" href="#">
-								{{svg "octicon-people" 20 "gt-mr-3"}}{{$.Repository.OwnerName}}/{{.Team.Name}}
-							</a>
-						{{end}}
+								{{if .User}}
+									<a id="reviewer_{{.ItemID}}" class="muted sidebar-item-link item gt-df gt-ac gt-f1 gt-py-3 gt-hidden" href="{{.User.HomeLink}}">{{ctx.AvatarUtils.Avatar .User 20 "gt-mr-3"}}{{.User.GetDisplayName}}</a>
+								{{else if .Team}}
+									<span id="reviewer_{{.ItemID}}" class="text item gt-df gt-ac gt-f1 gt-py-3 gt-hidden">{{svg "octicon-people" 20 "gt-mr-3"}}{{$.Repository.OwnerName}}/{{.Team.Name}}</span>
+								{{end}}
 					{{end}}
 				</div>
 			</div>