diff --git a/packages/cli/src/ui/components/ApprovalModeDialog.tsx b/packages/cli/src/ui/components/ApprovalModeDialog.tsx
index 163a45fd8..d81b6f4c0 100644
--- a/packages/cli/src/ui/components/ApprovalModeDialog.tsx
+++ b/packages/cli/src/ui/components/ApprovalModeDialog.tsx
@@ -54,7 +54,7 @@ export function ApprovalModeDialog({
 }: ApprovalModeDialogProps): React.JSX.Element {
   // Start with User scope by default
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
+    SettingScope.Workspace,
   );
 
   // Track the currently highlighted approval mode
diff --git a/packages/cli/src/ui/components/EditorSettingsDialog.tsx b/packages/cli/src/ui/components/EditorSettingsDialog.tsx
index 6926bf41d..fc2683bb8 100644
--- a/packages/cli/src/ui/components/EditorSettingsDialog.tsx
+++ b/packages/cli/src/ui/components/EditorSettingsDialog.tsx
@@ -33,7 +33,7 @@ export function EditorSettingsDialog({
   onExit,
 }: EditorDialogProps): React.JSX.Element {
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
+    SettingScope.Workspace,
   );
   const [focusedSection, setFocusedSection] = useState<'editor' | 'scope'>(
     'editor',
@@ -66,13 +66,6 @@ export function EditorSettingsDialog({
   }
 
   const scopeItems = [
-    {
-      get label() {
-        return t('User Settings');
-      },
-      value: SettingScope.User,
-      key: SettingScope.User,
-    },
     {
       get label() {
         return t('Workspace Settings');
@@ -80,6 +73,13 @@ export function EditorSettingsDialog({
       value: SettingScope.Workspace,
       key: SettingScope.Workspace,
     },
+    {
+      get label() {
+        return t('User Settings');
+      },
+      value: SettingScope.User,
+      key: SettingScope.User,
+    },
   ];
 
   const handleEditorSelect = (editorType: EditorType | 'not_set') => {
diff --git a/packages/cli/src/ui/components/SettingsDialog.tsx b/packages/cli/src/ui/components/SettingsDialog.tsx
index 45b0f5548..9c449db9e 100644
--- a/packages/cli/src/ui/components/SettingsDialog.tsx
+++ b/packages/cli/src/ui/components/SettingsDialog.tsx
@@ -63,7 +63,7 @@ export function SettingsDialog({
   );
   // Scope selector state (User by default)
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
+    SettingScope.Workspace,
   );
   // Active indices
   const [activeSettingIndex, setActiveSettingIndex] = useState(0);
diff --git a/packages/cli/src/ui/components/ThemeDialog.tsx b/packages/cli/src/ui/components/ThemeDialog.tsx
index a12fed797..7af589e39 100644
--- a/packages/cli/src/ui/components/ThemeDialog.tsx
+++ b/packages/cli/src/ui/components/ThemeDialog.tsx
@@ -39,7 +39,7 @@ export function ThemeDialog({
   terminalWidth,
 }: ThemeDialogProps): React.JSX.Element {
   const [selectedScope, setSelectedScope] = useState<SettingScope>(
-    SettingScope.User,
+    SettingScope.Workspace,
   );
 
   // Track the currently highlighted theme name
diff --git a/packages/cli/src/utils/dialogScopeUtils.ts b/packages/cli/src/utils/dialogScopeUtils.ts
index 027928abc..23caf7cea 100644
--- a/packages/cli/src/utils/dialogScopeUtils.ts
+++ b/packages/cli/src/utils/dialogScopeUtils.ts
@@ -26,11 +26,11 @@ export const SCOPE_LABELS = {
  */
 export function getScopeItems() {
   return [
-    { label: SCOPE_LABELS[SettingScope.User], value: SettingScope.User },
     {
       label: SCOPE_LABELS[SettingScope.Workspace],
       value: SettingScope.Workspace,
     },
+    { label: SCOPE_LABELS[SettingScope.User], value: SettingScope.User },
     // { label: SCOPE_LABELS[SettingScope.System], value: SettingScope.System },
   ];
 }