diff --git a/docs/_includes/default.njk b/docs/_includes/default.njk
index 11df8bde..4dc14d76 100644
--- a/docs/_includes/default.njk
+++ b/docs/_includes/default.njk
@@ -88,7 +88,7 @@
       </button>
     </div>
 
-    <aside id="sidebar" data-preserve-scroll data-turbo-permanent>
+    <aside id="sidebar" data-preserve-scroll>
       <header>
         <a href="/">
           <img src="{{ assetUrl('images/wordmark.svg') }}" alt="Shoelace" />
diff --git a/docs/assets/scripts/turbo.js b/docs/assets/scripts/turbo.js
index 0cd84bcb..4f85326b 100644
--- a/docs/assets/scripts/turbo.js
+++ b/docs/assets/scripts/turbo.js
@@ -11,52 +11,19 @@ import * as Turbo from 'https://cdn.jsdelivr.net/npm/@hotwired/turbo@7.3.0/+esm'
     })
   }
 
-  function restoreScroll () {
+  function restoreScroll (event) {
     document.querySelectorAll("[data-preserve-scroll").forEach((element) => {
       element.scrollTop = scrollPositions[element.id];
     })
+
+    if (event.detail && event.detail.newBody) {
+      event.detail.newBody.querySelectorAll("[data-preserve-scroll").forEach((element) => {
+        element.scrollTop = scrollPositions[element.id];
+      })
+    }
   }
 
   window.addEventListener("turbo:before-cache", preserveScroll)
   window.addEventListener("turbo:before-render", restoreScroll)
   window.addEventListener("turbo:render", restoreScroll)
-
-  // Do this to prevent jankiness on the sidebar.
-  // make sure it has data-turbo-permanent
-  function normalizePathname(pathname) {
-    // Remove /index.html
-    if (pathname.endsWith('/index.html')) {
-      pathname = pathname.replace(/\/index\.html/, '');
-    }
-
-    // Remove trailing slashes
-    return pathname.replace(/\/$/, '');
-  }
-
-  /**
-  * Adds a class name to links that are currently active.
-  */
-  function markActiveLinks(_event) {
-    const options = {
-      className: 'active-link', // the class to add to active links
-      pathname: document.location.pathname, // the current pathname to compare
-      within: 'body', // element containing the target links
-    };
-
-    const within = document.querySelector(options.within);
-
-    if (!within) {
-      return doc;
-    }
-
-    within.querySelectorAll('a').forEach(link => {
-      if (normalizePathname(options.pathname) === normalizePathname(link.pathname)) {
-        link.classList.add(options.className);
-      }
-    });
-
-    return doc;
-  };
-
-  window.addEventListener("turbo:load", markActiveLinks)
 })()