diff --git a/e2e/settings-mobile.spec.ts b/e2e/settings-mobile.spec.ts
index 2fbc4ec..632e66f 100644
--- a/e2e/settings-mobile.spec.ts
+++ b/e2e/settings-mobile.spec.ts
@@ -40,6 +40,14 @@ test('settings navigation and local preferences remain usable offline on mobile'
   await expect(general).toBeVisible();
   await expect(settingsNavigation).toBeHidden();
 
+  await page.getByRole('link', { name: 'All settings', exact: true }).click();
+  await expect(settingsNavigation).toBeVisible();
+  await expect(page).toHaveURL(/\/app\/settings$/);
+
+  await settingsNavigation.getByRole('link', { name: /General/ }).click();
+  await expect(general).toBeVisible();
+  await expect(settingsNavigation).toBeHidden();
+
   const method = general.getByRole('combobox', { name: 'Default payment method', exact: true });
   await expect(method).toHaveValue('card');
   await method.selectOption('cash');
diff --git a/src/components/SettingsWorkspace.tsx b/src/components/SettingsWorkspace.tsx
index 7ad4a1a..bf6148e 100644
--- a/src/components/SettingsWorkspace.tsx
+++ b/src/components/SettingsWorkspace.tsx
@@ -421,6 +421,7 @@ export default function SettingsWorkspace() {
           {activeSection ? (
             <Link
               href="/app/settings"
+              onClick={() => setActiveSection(null)}
               className={cn(
                 'mb-3 inline-flex min-h-11 items-center gap-2 rounded-lg px-1 text-sm font-semibold text-accent md:hidden',
                 focusVisibleRing
@@ -963,4 +964,4 @@ function SyncDetailRow({ label, value }: { label: string; value: string }) {
 function formatSyncTimestamp(value: string | null | undefined) {
   if (!value) return 'Never';
   return new Date(value).toLocaleString();
-}
+}
\ No newline at end of file