diff --git a/apps/macos/Sources/Clawdis/SettingsRootView.swift b/apps/macos/Sources/Clawdis/SettingsRootView.swift
index a20de367c..86af1400c 100644
--- a/apps/macos/Sources/Clawdis/SettingsRootView.swift
+++ b/apps/macos/Sources/Clawdis/SettingsRootView.swift
@@ -7,50 +7,47 @@ struct SettingsRootView: View {
     @State private var selectedTab: SettingsTab = .general
 
     var body: some View {
-        ScrollView(.vertical) {
-            TabView(selection: self.$selectedTab) {
-                GeneralSettings(state: self.state)
-                    .tabItem { Label("General", systemImage: "gearshape") }
-                    .tag(SettingsTab.general)
+        TabView(selection: self.$selectedTab) {
+            GeneralSettings(state: self.state)
+                .tabItem { Label("General", systemImage: "gearshape") }
+                .tag(SettingsTab.general)
 
-                VoiceWakeSettings(state: self.state)
-                    .tabItem { Label("Voice Wake", systemImage: "waveform.circle") }
-                    .tag(SettingsTab.voiceWake)
+            VoiceWakeSettings(state: self.state)
+                .tabItem { Label("Voice Wake", systemImage: "waveform.circle") }
+                .tag(SettingsTab.voiceWake)
 
-                ConfigSettings()
-                    .tabItem { Label("Config", systemImage: "slider.horizontal.3") }
-                    .tag(SettingsTab.config)
+            ConfigSettings()
+                .tabItem { Label("Config", systemImage: "slider.horizontal.3") }
+                .tag(SettingsTab.config)
 
-                PermissionsSettings(
-                    status: self.permissionMonitor.status,
-                    refresh: self.refreshPerms,
-                    showOnboarding: { OnboardingController.shared.show() })
-                    .tabItem { Label("Permissions", systemImage: "lock.shield") }
-                    .tag(SettingsTab.permissions)
+            PermissionsSettings(
+                status: self.permissionMonitor.status,
+                refresh: self.refreshPerms,
+                showOnboarding: { OnboardingController.shared.show() })
+                .tabItem { Label("Permissions", systemImage: "lock.shield") }
+                .tag(SettingsTab.permissions)
 
-                SessionsSettings()
-                    .tabItem { Label("Sessions", systemImage: "clock.arrow.circlepath") }
-                    .tag(SettingsTab.sessions)
+            SessionsSettings()
+                .tabItem { Label("Sessions", systemImage: "clock.arrow.circlepath") }
+                .tag(SettingsTab.sessions)
 
-                ToolsSettings()
-                    .tabItem { Label("Tools", systemImage: "wrench.and.screwdriver") }
-                    .tag(SettingsTab.tools)
+            ToolsSettings()
+                .tabItem { Label("Tools", systemImage: "wrench.and.screwdriver") }
+                .tag(SettingsTab.tools)
 
-                if self.state.debugPaneEnabled {
-                    DebugSettings()
-                        .tabItem { Label("Debug", systemImage: "ant") }
-                        .tag(SettingsTab.debug)
-                }
-
-                AboutSettings()
-                    .tabItem { Label("About", systemImage: "info.circle") }
-                    .tag(SettingsTab.about)
+            if self.state.debugPaneEnabled {
+                DebugSettings()
+                    .tabItem { Label("Debug", systemImage: "ant") }
+                    .tag(SettingsTab.debug)
             }
-            .padding(.horizontal, 28)
-            .padding(.vertical, 22)
-            .frame(maxWidth: .infinity, alignment: .topLeading)
+
+            AboutSettings()
+                .tabItem { Label("About", systemImage: "info.circle") }
+                .tag(SettingsTab.about)
         }
-        .frame(minWidth: SettingsTab.windowWidth, minHeight: SettingsTab.windowHeight)
+        .padding(.horizontal, 28)
+        .padding(.vertical, 22)
+        .frame(width: SettingsTab.windowWidth, height: SettingsTab.windowHeight, alignment: .topLeading)
         .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
         .onReceive(NotificationCenter.default.publisher(for: .clawdisSelectSettingsTab)) { note in
             if let tab = note.object as? SettingsTab {