diff --git a/layouts/_default/_markup/render-link.html b/layouts/_default/_markup/render-link.html
index a6e54ab59..943e7c4a7 100644
--- a/layouts/_default/_markup/render-link.html
+++ b/layouts/_default/_markup/render-link.html
@@ -1 +1 @@
-<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank"{{ end }}>{{ .Text }}</a>
\ No newline at end of file
+<a href="{{ .Destination | safeURL }}"{{ with .Title}} title="{{ . }}"{{ end }}{{ if strings.HasPrefix .Destination "http" }} target="_blank" rel="noopener noreferrer"{{ end }}>{{ .Text }}</a>
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 1d5b5ac56..9793e6b06 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -110,13 +110,13 @@
                 <ul class="dropdown-menu">
                     {{ range .Children }}
                     <li {{ if eq $section .URL }} class="active"{{ end}}>
-                        <a href="{{ .URL | relLangURL }}">{{ .Name }}</a>
+                        <a href="{{ .URL | relLangURL }}">{{ .Name | safeHTML }}</a>
                     </li>
                     {{ end }}
                 </ul>
             </li>
             {{ else }}
-            <li {{ if eq $section .URL }} class="active"{{ end}}><a data-docs="{{ .Name }}" href="{{ .URL | relLangURL }}">{{ .Name }}</a></li>
+            <li {{ if eq $section .URL }} class="active"{{ end}}><a data-docs="{{ .Name }}" href="{{ .URL | relLangURL }}">{{ .Name | safeHTML }}</a></li>
             {{ end }}
 
             {{ end }}