diff --git a/astro.config.mjs b/astro.config.mjs
index 618169cb1..0bd8c991e 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -48,10 +48,7 @@ export default defineConfig({
       [
         rehypeAutolinkHeadings,
         {
-          behavior: "append",
-          content() {
-            return [h("span.heading-link", "#")];
-          },
+          behavior: "wrap",
         },
       ],
     ],
diff --git a/src/styles/global.css b/src/styles/global.css
index 1607f3f87..ae6493815 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -54,6 +54,15 @@ body {
   text-decoration: none !important;
 }
 
+.prose :is(h1, h2, h3, h4, h5, h6) a:hover {
+  text-decoration: underline !important;
+}
+
+.prose :is(h1, h2, h3, h4, h5, h6) a:focus {
+  outline: 4px solid #0073e6;
+  outline-offset: 5px;
+}
+
 ul.milestone-done li {
   position: relative;
   list-style: none;