diff --git a/src/App.tsx b/src/App.tsx
index 46876ed..b1afbc7 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -116,6 +116,7 @@ export function App() {
     const withOnboarding: AppConfig = { ...next, onboardingCompleted: true };
     saveConfig(withOnboarding);
     setConfig(withOnboarding);
+    setSettingsOpen(false);
   }, []);
 
   const handleModeChange = useCallback(
diff --git a/src/components/SettingsDialog.tsx b/src/components/SettingsDialog.tsx
index 68dd61c..e14a07f 100644
--- a/src/components/SettingsDialog.tsx
+++ b/src/components/SettingsDialog.tsx
@@ -276,10 +276,7 @@ export function SettingsDialog({
             type="button"
             className="primary"
             disabled={!canSave}
-            onClick={() => {
-              onSave(cfg);
-              onClose();
-            }}
+            onClick={() => onSave(cfg)}
           >
             {welcome ? t('settings.getStarted') : t('common.save')}
           </button>