diff --git a/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.test.tsx b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.test.tsx
new file mode 100644
index 00000000000..940c2617184
--- /dev/null
+++ b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.test.tsx
@@ -0,0 +1,71 @@
+import { screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { RestartServerButton } from './RestartServerButton'
+import { customRender } from '@/tests/lib/custom-render'
+
+const {
+  mockUseAsyncCheckPermissions,
+  mockUseFlag,
+  mockUseIsFeatureEnabled,
+  mockUseSelectedProjectQuery,
+} = vi.hoisted(() => ({
+  mockUseAsyncCheckPermissions: vi.fn(),
+  mockUseFlag: vi.fn(),
+  mockUseIsFeatureEnabled: vi.fn(),
+  mockUseSelectedProjectQuery: vi.fn(),
+}))
+
+vi.mock('common', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('common')>()),
+  useFlag: mockUseFlag,
+}))
+
+vi.mock('next/router', () => ({
+  useRouter: () => ({ push: vi.fn() }),
+}))
+
+vi.mock('@/hooks/misc/useCheckPermissions', () => ({
+  useAsyncCheckPermissions: mockUseAsyncCheckPermissions,
+}))
+
+vi.mock('@/hooks/misc/useIsFeatureEnabled', () => ({
+  useIsFeatureEnabled: mockUseIsFeatureEnabled,
+}))
+
+vi.mock('@/hooks/misc/useSelectedProject', () => ({
+  useIsAwsK8sCloudProvider: () => false,
+  useIsProjectActive: () => true,
+  useSelectedProjectQuery: mockUseSelectedProjectQuery,
+}))
+
+describe('RestartServerButton', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockUseFlag.mockReturnValue(false)
+    mockUseAsyncCheckPermissions.mockReturnValue({ can: true })
+    mockUseIsFeatureEnabled.mockReturnValue({ projectSettingsRestartProject: true })
+    mockUseSelectedProjectQuery.mockReturnValue({
+      data: { ref: 'default', region: 'us-east-1', status: 'ACTIVE_HEALTHY' },
+    })
+  })
+
+  it('uses separate tab stops for the primary action and restart type menu', async () => {
+    const user = userEvent.setup()
+    customRender(<RestartServerButton />)
+
+    const restartProject = screen.getByRole('button', { name: 'Restart project' })
+    const chooseRestartType = screen.getByRole('button', { name: 'Choose restart type' })
+
+    await user.tab()
+    expect(restartProject).toHaveFocus()
+
+    await user.tab()
+    expect(chooseRestartType).toHaveFocus()
+
+    await user.keyboard('{Enter}')
+    expect(await screen.findByRole('menuitem', { name: /Fast database reboot/ })).toHaveFocus()
+    expect(screen.getByText(/Other project services remain running/)).toBeVisible()
+  })
+})
diff --git a/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx
index 8eda0ce5e83..db3b604491a 100644
--- a/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx
+++ b/apps/studio/components/interfaces/Settings/General/Infrastructure/RestartServerButton.tsx
@@ -107,6 +107,7 @@ export const RestartServerButton = () => {
       {projectSettingsRestartProject ? (
         <div className="flex w-full @lg:w-auto">
           <ButtonTooltip
+            type="button"
             variant="default"
             className={cn(
               'flex-1 px-3 hover:z-10 focus-visible:z-10 @lg:flex-none',
@@ -141,8 +142,9 @@ export const RestartServerButton = () => {
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
                 <Button
+                  type="button"
                   variant="default"
-                  aria-label={`Restart ${entityLabel}`}
+                  aria-label="Choose restart type"
                   className="shrink-0 rounded-l-none px-[4px] py-[5px] -ml-px focus-visible:z-10 focus-visible:rounded-l-sm"
                   icon={<ChevronDown />}
                   disabled={!canRestartProject}
@@ -158,9 +160,9 @@ export const RestartServerButton = () => {
                 >
                   <div className="space-y-0.5">
                     <p className="block text-foreground">Fast database reboot</p>
-                    <p className="block text-foreground-light">
-                      Restarts only the database. Faster, but may not be able to recover from all
-                      failure modes.
+                    <p className="block text-foreground-lighter">
+                      Restarts only the database service, with less downtime than a full project
+                      restart. Other project services remain running.
                     </p>
                   </div>
                 </DropdownMenuItem>
diff --git a/apps/studio/components/interfaces/Settings/General/Project.tsx b/apps/studio/components/interfaces/Settings/General/Project.tsx
index 2af66db00af..2ffa2e1c015 100644
--- a/apps/studio/components/interfaces/Settings/General/Project.tsx
+++ b/apps/studio/components/interfaces/Settings/General/Project.tsx
@@ -72,7 +72,7 @@ export const Project = () => {
                 <div>
                   <p className="text-sm">{primaryActionLabel}</p>
                   <div className="max-w-[420px]">
-                    <p className="text-sm text-foreground-light">{primaryActionDescription}</p>
+                    <p className="text-sm text-foreground-lighter">{primaryActionDescription}</p>
                   </div>
                 </div>
                 {isPaused ? (
@@ -98,7 +98,7 @@ export const Project = () => {
                   <div>
                     <p className="text-sm">Pause {entityLabel}</p>
                     <div className="max-w-[420px]">
-                      <p className="text-sm text-foreground-light">
+                      <p className="text-sm text-foreground-lighter">
                         Your {entityLabel} will not be accessible while it is paused.
                       </p>
                     </div>