diff --git a/src/components/AutoApproveSwitch.tsx b/src/components/AutoApproveSwitch.tsx
new file mode 100644
index 0000000..2961a6f
--- /dev/null
+++ b/src/components/AutoApproveSwitch.tsx
@@ -0,0 +1,19 @@
+import { useSettings } from "@/hooks/useSettings";
+import { Label } from "@/components/ui/label";
+import { Switch } from "@/components/ui/switch";
+
+export function AutoApproveSwitch() {
+  const { settings, updateSettings } = useSettings();
+  return (
+    <div className="flex items-center space-x-2">
+      <Switch
+        id="auto-approve"
+        checked={settings?.autoApproveChanges}
+        onCheckedChange={() =>
+          updateSettings({ autoApproveChanges: !settings?.autoApproveChanges })
+        }
+      />
+      <Label htmlFor="auto-approve">Auto-approve</Label>
+    </div>
+  );
+}
diff --git a/src/components/chat/ChatInput.tsx b/src/components/chat/ChatInput.tsx
index 1ad5f13..16f8c03 100644
--- a/src/components/chat/ChatInput.tsx
+++ b/src/components/chat/ChatInput.tsx
@@ -35,6 +35,7 @@ import {
 import type { Message } from "@/ipc/ipc_types";
 import { isPreviewOpenAtom } from "@/atoms/viewAtoms";
 import { useRunApp } from "@/hooks/useRunApp";
+import { AutoApproveSwitch } from "../AutoApproveSwitch";
 
 export function ChatInput({ chatId }: { chatId?: number }) {
   const [inputValue, setInputValue] = useAtom(chatInputValueAtom);
@@ -302,16 +303,6 @@ function ActionProposalActions({ proposal }: { proposal: ActionProposal }) {
   );
 }
 
-function AutoApproveSwitch() {
-  // const [autoApprove, setAutoApprove] = useAtom(autoApproveAtom);
-  return (
-    <div className="flex items-center space-x-2">
-      <Switch id="auto-approve" />
-      <Label htmlFor="auto-approve">Auto-approve</Label>
-    </div>
-  );
-}
-
 interface ChatInputActionsProps {
   proposal: Proposal;
   onApprove: () => void;
diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx
index dfe2b2f..f96ce66 100644
--- a/src/pages/settings.tsx
+++ b/src/pages/settings.tsx
@@ -4,6 +4,7 @@ import { ProviderSettingsGrid } from "@/components/ProviderSettings";
 import ConfirmationDialog from "@/components/ConfirmationDialog";
 import { IpcClient } from "@/ipc/ipc_client";
 import { showSuccess, showError } from "@/lib/toast";
+import { AutoApproveSwitch } from "@/components/AutoApproveSwitch";
 
 export default function SettingsPage() {
   const { theme, setTheme } = useTheme();
@@ -63,10 +64,17 @@ export default function SettingsPage() {
         <div className="space-y-6">
           <div className="bg-white dark:bg-gray-800 rounded-xl shadow-sm p-6">
             <h2 className="text-lg font-medium text-gray-900 dark:text-white mb-4">
-              Appearance
+              General Settings
             </h2>
 
             <div className="space-y-4">
+              <div className="space-y-2">
+                <AutoApproveSwitch />
+                <div className="text-sm text-gray-500 dark:text-gray-400">
+                  This will automatically approve code changes and run them.
+                </div>
+              </div>
+
               <div className="flex items-center justify-between">
                 <label className="text-sm font-medium text-gray-700 dark:text-gray-300">
                   Theme