diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
new file mode 100644
index 00000000..39b1a9a7
--- /dev/null
+++ b/layouts/_default/_markup/render-heading.html
@@ -0,0 +1 @@
+<h{{ .Level }} id="{{ .Anchor | safeURL }}">{{ .Text | safeHTML }}<a class="small paigeheaderlink" href="#{{ .Anchor | safeURL }}">#</a></h{{ .Level }}>
diff --git a/layouts/partials/paige-content.html b/layouts/partials/paige-content.html
index d7e075d3..d720fa8c 100644
--- a/layouts/partials/paige-content.html
+++ b/layouts/partials/paige-content.html
@@ -7,7 +7,7 @@
                     {{ if .Scratch.Get "paige_show_full_pages" }}
                     {{ .Content }}
                     {{ else }}
-                    {{ .Content | replaceRE `(<h[1-6] id="([^"]+)".+)(</h[1-6]+>)` `${1}<a class="small paigeheaderlink" href="#${2}">#</a>${3}` | safeHTML }}
+                    {{ .Content }}
                     {{ end }}
                 </article>
             </div>