diff --git a/AUDIT_LOG.md b/AUDIT_LOG.md
index 3291e89..be7f2bf 100644
--- a/AUDIT_LOG.md
+++ b/AUDIT_LOG.md
@@ -30,6 +30,15 @@ In the Settings global shortcuts section, the `renderShortcutDisplay` function g
 
 ---
 
+### 2026-06-25 - fix: hide scrollbars on Windows/Linux in Settings and editor
+
+**Details/Why:**
+`.settings-content` and `.editor-container` used `overflow-y: auto`/`overflow: auto` without scrollbar-hiding rules. macOS overlay scrollbars auto-hide, but Windows/Linux show persistent scrollbars. Added `scrollbar-width: none` (Firefox), `-ms-overflow-style: none` (IE/Edge), and `::-webkit-scrollbar { display: none }` (Chrome/Edge/Safari) to both containers.
+
+**Files changed:** `src/Settings.css`, `src/App.css`, `CHANGELOG.md`.
+
+---
+
 ### 2026-06-25 - fix: window state persistence and login-item toggle desync (v0.5.4)
 
 **Details/Why:**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3211079..7fa2dfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - **Window no longer shifts down on restart on macOS**: Removed the +/-28px compensation that was incorrectly added for a macOS frameless window offset which does not exist in `tauri-plugin-window-state` v2.4.1 — the plugin correctly saves `outer_position()` and restores via `set_position()` with no titlebar offset for frameless windows.
 - **Shortcut key pill "+" centered between key caps**: The `+` separator in the shortcut display was grouped inside the same `<span>` as the key cap to its left with `justify-content: space-evenly`, making it appear visually attached to the left pill. Restructured to a flat flex layout with `gap` so the `+` is independently centered with equal spacing on both sides.
 - **Login-item toggle stays in sync with macOS System Settings**: The launch-at-startup toggle only read from `localStorage`, so removing PaperCache from System Settings left the toggle permanently stuck in the checked state. Fixed by adding a `get_launch_at_startup` Tauri command that queries the actual OS login-item state via `app.autolaunch().is_enabled()`, and syncing the toggle with the real OS state on every Settings mount.
+- **Scrollbars hidden on Windows/Linux in Settings and editor**: `.settings-content` and `.editor-container` had `overflow-y: auto`/`overflow: auto` but no scrollbar-hiding rules. macOS overlay scrollbars auto-hide, but Windows/Linux show persistent scrollbars. Added `scrollbar-width: none` (Firefox), `-ms-overflow-style: none` (IE/Edge legacy), and `::-webkit-scrollbar { display: none }` (Chrome/Safari/Edge Chromium) to both containers.
 
 ## [v0.5.3] - 2026-06-24
 
diff --git a/src/App.css b/src/App.css
index 9684264..13a1ed5 100644
--- a/src/App.css
+++ b/src/App.css
@@ -93,6 +93,12 @@ body {
   width: 100%;
   overflow: auto;
   padding: 0; /* Let codemirror handle padding */
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+}
+
+.editor-container::-webkit-scrollbar {
+  display: none;
 }
 
 /* CodeMirror overrides */
diff --git a/src/Settings.css b/src/Settings.css
index 0ca6327..f79ca4e 100644
--- a/src/Settings.css
+++ b/src/Settings.css
@@ -24,6 +24,12 @@
   flex: 1;
   overflow-y: auto;
   padding: 0 10px;
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+}
+
+.settings-content::-webkit-scrollbar {
+  display: none;
 }
 
 section {