diff --git a/app/javascript/controllers/settings_scroll_controller.js b/app/javascript/controllers/settings_scroll_controller.js
new file mode 100644
index 000000000..585be9bcc
--- /dev/null
+++ b/app/javascript/controllers/settings_scroll_controller.js
@@ -0,0 +1,39 @@
+import { Controller } from "@hotwired/stimulus";
+
+// Preserves the settings content scroll position PER PAGE across Turbo Drive
+// navigation. Settings nav items are plain links (full-body Turbo visits), and
+// Turbo only restores window scroll — so this nested overflow-y-auto container
+// snaps to top on every visit.
+//
+// Keyed by pathname: returning to a page restores its scroll, a brand-new page
+// starts at the top, and a same-page re-render (e.g. a settings form that
+// auto-submits) keeps scroll. This differs from the nav's `preserve-scroll`
+// controller, which intentionally carries one position across all pages because
+// the nav is the same persistent element on every settings page.
+export default class extends Controller {
+  static positions = {};
+
+  connect() {
+    this.save = this.save.bind(this);
+    document.addEventListener("turbo:before-cache", this.save);
+    this.restore();
+  }
+
+  disconnect() {
+    document.removeEventListener("turbo:before-cache", this.save);
+  }
+
+  save() {
+    this.constructor.positions[window.location.pathname] = {
+      top: this.element.scrollTop,
+      left: this.element.scrollLeft,
+    };
+  }
+
+  restore() {
+    const pos = this.constructor.positions[window.location.pathname];
+    if (!pos) return;
+    this.element.scrollTop = pos.top;
+    this.element.scrollLeft = pos.left;
+  }
+}
diff --git a/app/views/layouts/settings.html.erb b/app/views/layouts/settings.html.erb
index 887789332..8b112e3dd 100644
--- a/app/views/layouts/settings.html.erb
+++ b/app/views/layouts/settings.html.erb
@@ -11,7 +11,7 @@
 
     <main id="main" class="grow flex h-full">
       <div class="relative max-w-4xl mx-auto flex flex-col w-full h-full">
-        <div class="grow flex flex-col overflow-y-auto overflow-x-hidden overscroll-contain [-webkit-overflow-scrolling:touch]">
+        <div data-controller="settings-scroll" class="grow flex flex-col overflow-y-auto overflow-x-hidden overscroll-contain [-webkit-overflow-scrolling:touch]">
           <div class="sticky top-0 z-10 px-3 md:px-10 pt-1.5 md:pt-3 pb-3 bg-surface border-b border-tertiary shrink-0">
             <% if content_for?(:breadcrumbs) %>
               <%= yield :breadcrumbs %>