diff --git a/docs/assets/caffeinate-agent-menu-after.png b/docs/assets/caffeinate-agent-menu-after.png
new file mode 100644
index 00000000000..393fbd5c0b1
Binary files /dev/null and b/docs/assets/caffeinate-agent-menu-after.png differ
diff --git a/docs/assets/caffeinate-agent-menu-before.png b/docs/assets/caffeinate-agent-menu-before.png
new file mode 100644
index 00000000000..7c12d9ca581
Binary files /dev/null and b/docs/assets/caffeinate-agent-menu-before.png differ
diff --git a/src/renderer/src/components/settings/AgentAwakeSetting.tsx b/src/renderer/src/components/settings/AgentAwakeSetting.tsx
index 7df934be0c7..216dff6facf 100644
--- a/src/renderer/src/components/settings/AgentAwakeSetting.tsx
+++ b/src/renderer/src/components/settings/AgentAwakeSetting.tsx
@@ -57,7 +57,7 @@ export function AgentAwakeSetting({
               },
               {
                 value: 'auto',
-                label: translate('auto.components.settings.AgentAwakeSetting.auto', 'Auto')
+                label: translate('auto.components.settings.AgentAwakeSetting.auto', 'Agent')
               },
               {
                 value: 'off',
diff --git a/src/renderer/src/components/settings/AgentsPane.test.tsx b/src/renderer/src/components/settings/AgentsPane.test.tsx
index af821f94920..3b2f7bb964b 100644
--- a/src/renderer/src/components/settings/AgentsPane.test.tsx
+++ b/src/renderer/src/components/settings/AgentsPane.test.tsx
@@ -244,10 +244,10 @@ describe('AgentsPane', () => {
     expect(markup).not.toContain('aria-label="Agent runtime"')
     expect(markup).toContain('Keep computer awake')
     expect(markup).toContain(
-      'Choose On, Auto while agents are working, or Off. Orca also asks this device to stay awake when the lid is closed, subject to its power policy.'
+      'Choose On, Agent, or Off. Agent mode stays awake while agents are working. Orca also asks this device to stay awake when the lid is closed, subject to its power policy.'
     )
     expect(markup).toContain('role="radiogroup"')
-    expect(markup).toContain('>Auto<')
+    expect(markup).toContain('>Agent<')
   })
 
   it('hides desktop-only awake modes in paired web clients', () => {
@@ -316,7 +316,7 @@ describe('AgentsPane', () => {
 
   it('describes Windows lid behavior according to the device', () => {
     expect(getAgentAwakeDescription('Windows')).toBe(
-      "Choose On, Auto while agents are working, or Off. Lid-close behavior follows this device's power settings."
+      "Choose On, Agent, or Off. Agent mode stays awake while agents are working; lid-close behavior follows this device's power settings."
     )
   })
 
diff --git a/src/renderer/src/components/settings/agent-awake-copy.ts b/src/renderer/src/components/settings/agent-awake-copy.ts
index 1076312ed18..307b8ef125d 100644
--- a/src/renderer/src/components/settings/agent-awake-copy.ts
+++ b/src/renderer/src/components/settings/agent-awake-copy.ts
@@ -17,13 +17,13 @@ export function getAgentAwakeDescription(
   if (userAgent.includes('Windows')) {
     return translate(
       AGENT_AWAKE_DESCRIPTION_WINDOWS_KEY,
-      "Choose On, Auto while agents are working, or Off. Lid-close behavior follows this device's power settings."
+      "Choose On, Agent, or Off. Agent mode stays awake while agents are working; lid-close behavior follows this device's power settings."
     )
   }
 
   return translate(
     AGENT_AWAKE_DESCRIPTION_DEFAULT_KEY,
-    'Choose On, Auto while agents are working, or Off. Orca also asks this device to stay awake when the lid is closed, subject to its power policy.'
+    'Choose On, Agent, or Off. Agent mode stays awake while agents are working. Orca also asks this device to stay awake when the lid is closed, subject to its power policy.'
   )
 }
 
diff --git a/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx b/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx
index b991e63a096..6bf6daabcad 100644
--- a/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx
+++ b/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx
@@ -31,7 +31,7 @@ function modeLabel(mode: ComputerAwakeMode): string {
     return translate('auto.components.status.bar.CaffeinateStatusSegment.on', 'On')
   }
   if (mode === 'auto') {
-    return translate('auto.components.status.bar.CaffeinateStatusSegment.auto', 'Auto')
+    return translate('auto.components.status.bar.CaffeinateStatusSegment.auto', 'Agent')
   }
   return translate('auto.components.status.bar.CaffeinateStatusSegment.off', 'Off')
 }
@@ -137,7 +137,7 @@ export function CaffeinateStatusSegment({
         </DropdownMenuLabel>
         <DropdownMenuSeparator />
         <DropdownMenuRadioGroup value={mode} onValueChange={setMode}>
-          <DropdownMenuRadioItem value="on" className="items-start py-1.5">
+          <DropdownMenuRadioItem value="on" className="py-1.5">
             <span className="flex flex-col">
               <span>{modeLabel('on')}</span>
               <span className="text-[11px] font-normal text-muted-foreground">
@@ -148,7 +148,7 @@ export function CaffeinateStatusSegment({
               </span>
             </span>
           </DropdownMenuRadioItem>
-          <DropdownMenuRadioItem value="auto" className="items-start py-1.5">
+          <DropdownMenuRadioItem value="auto" className="py-1.5">
             <span className="flex flex-col">
               <span>{modeLabel('auto')}</span>
               <span className="text-[11px] font-normal text-muted-foreground">
@@ -159,7 +159,7 @@ export function CaffeinateStatusSegment({
               </span>
             </span>
           </DropdownMenuRadioItem>
-          <DropdownMenuRadioItem value="off" className="items-start py-1.5">
+          <DropdownMenuRadioItem value="off" className="py-1.5">
             <span className="flex flex-col">
               <span>{modeLabel('off')}</span>
               <span className="text-[11px] font-normal text-muted-foreground">
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 1888c99acc4..e44b76eabd1 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -3639,7 +3639,7 @@
           },
           "CaffeinateStatusSegment": {
             "on": "On",
-            "auto": "Auto",
+            "auto": "Agent",
             "off": "Off",
             "active": "Active",
             "inactive": "Inactive",
@@ -9510,8 +9510,8 @@
           "95d3031db2": "Keeps this computer and display awake while agents are working. Lid-close behavior follows this device's power settings.",
           "a42f6fbdd8": "Keeps this computer and display awake while agents are working. Orca also asks this device to stay awake when the lid is closed, subject to its power policy.",
           "modeTitle": "Keep computer awake",
-          "modeDescriptionWindows": "Choose On, Auto while agents are working, or Off. Lid-close behavior follows this device's power settings.",
-          "modeDescriptionDefault": "Choose On, Auto while agents are working, or Off. Orca also asks this device to stay awake when the lid is closed, subject to its power policy."
+          "modeDescriptionWindows": "Choose On, Agent, or Off. Agent mode stays awake while agents are working; lid-close behavior follows this device's power settings.",
+          "modeDescriptionDefault": "Choose On, Agent, or Off. Agent mode stays awake while agents are working. Orca also asks this device to stay awake when the lid is closed, subject to its power policy."
         },
         "agent-status-hooks-copy": {
           "7707c15abb": "Agent status hooks",
@@ -10573,7 +10573,7 @@
         },
         "AgentAwakeSetting": {
           "on": "On",
-          "auto": "Auto",
+          "auto": "Agent",
           "off": "Off"
         }
       },