diff --git a/assets/scss/custom.scss b/assets/scss/custom.scss
index c1696f18..d3b014f1 100644
--- a/assets/scss/custom.scss
+++ b/assets/scss/custom.scss
@@ -165,16 +165,10 @@ footer {
 
 }
 
-/* Adjust heading anchors for site header */
-.td-content {
-  &> h2,
-  &> h3,
-  &> h4,
-  &> h5,
-  &> h6,
-  .rendered-data h1 {
-    scroll-margin-top: 5rem;
-  }
+/* Adjust the scroll margin for everything in the main content, so that
+ * it doesn't disappear behind the header bar */
+.td-content * {
+  scroll-margin-top: 5.5rem;
 }
 
 /* Styles for the table of contents */
diff --git a/layouts/shortcodes/definition.html b/layouts/shortcodes/definition.html
index fdb307f7..02f2c6b0 100644
--- a/layouts/shortcodes/definition.html
+++ b/layouts/shortcodes/definition.html
@@ -30,7 +30,7 @@
 {{ $definition = partial "json-schema/resolve-refs" (dict "schema" $definition "path" $path) }}
 {{ $definition = partial "json-schema/resolve-allof" $definition }}
 
-<section class="rendered-data definition">
+<section class="rendered-data definition" id="{{ anchorize $definition.title }}">
 
 <details {{ if not $compact }}open{{ end }}>
 <summary>