diff --git a/templates/repo/commit_status.tmpl b/templates/repo/commit_status.tmpl
index d5f75c132..73e842643 100644
--- a/templates/repo/commit_status.tmpl
+++ b/templates/repo/commit_status.tmpl
@@ -1,15 +1,15 @@
 {{if eq .State "pending"}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status circle icon yellow"></i></a>
+	<a href="{{.TargetURL}}" target=_blank rel="noopener noreferrer"><i class="commit-status circle icon yellow"></i></a>
 {{end}}
 {{if eq .State "success"}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status check icon green"></i></a>
+	<a href="{{.TargetURL}}" target=_blank rel="noopener noreferrer"><i class="commit-status check icon green"></i></a>
 {{end}}
 {{if eq .State "error"}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status warning icon red"></i></a>
+	<a href="{{.TargetURL}}" target=_blank rel="noopener noreferrer"><i class="commit-status warning icon red"></i></a>
 {{end}}
 {{if eq .State "failure"}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status remove icon red"></i></a>
+	<a href="{{.TargetURL}}" target=_blank rel="noopener noreferrer"><i class="commit-status remove icon red"></i></a>
 {{end}}
 {{if eq .State "warning"}}
-	<a href="{{.TargetURL}}" target=_blank><i class="commit-status warning sign icon yellow"></i></a>
-{{end}}
\ No newline at end of file
+	<a href="{{.TargetURL}}" target=_blank rel="noopener noreferrer"><i class="commit-status warning sign icon yellow"></i></a>
+{{end}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 03770d585..a496b9b91 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -60,7 +60,7 @@
 			{{end}}
 
 			{{if .Repository.UnitEnabled $.UnitTypeExternalTracker}}
-				<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues" target="_blank">
+				<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues" target="_blank" rel="noopener noreferrer">
 					<i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} </span>
 				</a>
 			{{end}}
@@ -78,7 +78,7 @@
 			{{end}}
 
 			{{if or (.Repository.UnitEnabled $.UnitTypeWiki) (.Repository.UnitEnabled $.UnitTypeExternalWiki)}}
-				<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Repository.UnitEnabled $.UnitTypeExternalWiki)}} target="_blank" {{end}}>
+				<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Repository.UnitEnabled $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
 					<i class="octicon octicon-book"></i> {{.i18n.Tr "repo.wiki"}}
 				</a>
 			{{end}}