diff --git a/website/themes/micromdm/layouts/_default/_markup/render-heading.html b/website/themes/micromdm/layouts/_default/_markup/render-heading.html
new file mode 100644
index 00000000..29a973b8
--- /dev/null
+++ b/website/themes/micromdm/layouts/_default/_markup/render-heading.html
@@ -0,0 +1,6 @@
+<span class="header-hidden-anchor">
+<h{{ .Level }} id="{{ .Anchor }}">
+  {{ .Text | safeHTML }}
+  <a href="#{{ .Anchor }}">#</a>
+</h{{ .Level }}>
+</span>
diff --git a/website/themes/micromdm/static/css/micromdm.css b/website/themes/micromdm/static/css/micromdm.css
index a5a1ee4a..fb44c969 100644
--- a/website/themes/micromdm/static/css/micromdm.css
+++ b/website/themes/micromdm/static/css/micromdm.css
@@ -492,4 +492,12 @@ section p {
 }
 .post blockquote p {
   padding:0.5em;
+}
+
+.header-hidden-anchor a {
+  visibility: hidden;
+}
+
+.header-hidden-anchor:hover a {
+  visibility: visible;
 }
\ No newline at end of file