diff --git a/src/pages/AiProvidersAmpcodeEditPage.tsx b/src/pages/AiProvidersAmpcodeEditPage.tsx
index e50b5b3..516a3b5 100644
--- a/src/pages/AiProvidersAmpcodeEditPage.tsx
+++ b/src/pages/AiProvidersAmpcodeEditPage.tsx
@@ -14,6 +14,7 @@ import type { AmpcodeConfig } from '@/types';
 import { maskApiKey } from '@/utils/format';
 import { buildAmpcodeFormState, entriesToAmpcodeMappings } from '@/components/providers/utils';
 import type { AmpcodeFormState } from '@/components/providers';
+import layoutStyles from './AiProvidersEditLayout.module.scss';
 
 type LocationState = { fromAiProviders?: boolean } | null;
 
@@ -97,8 +98,9 @@ export function AiProvidersAmpcodeEditPage() {
         if (!mountedRef.current) return;
         setError(getErrorMessage(err) || t('notification.refresh_failed'));
       } finally {
-        if (!mountedRef.current) return;
-        setLoading(false);
+        if (mountedRef.current) {
+          setLoading(false);
+        }
       }
     })();
   }, [clearCache, t, updateConfigValue]);
@@ -220,6 +222,7 @@ export function AiProvidersAmpcodeEditPage() {
   return (
     <SecondaryScreenShell
       ref={swipeRef}
+      contentClassName={layoutStyles.content}
       title={title}
       onBack={handleBack}
       backLabel={t('common.back')}
diff --git a/src/pages/AiProvidersClaudeEditPage.tsx b/src/pages/AiProvidersClaudeEditPage.tsx
index c2e6661..dcf4384 100644
--- a/src/pages/AiProvidersClaudeEditPage.tsx
+++ b/src/pages/AiProvidersClaudeEditPage.tsx
@@ -14,6 +14,7 @@ import type { ProviderKeyConfig } from '@/types';
 import { buildHeaderObject, headersToEntries } from '@/utils/headers';
 import { excludedModelsToText, parseExcludedModels } from '@/components/providers/utils';
 import type { ProviderFormState } from '@/components/providers';
+import layoutStyles from './AiProvidersEditLayout.module.scss';
 
 type LocationState = { fromAiProviders?: boolean } | null;
 
@@ -192,6 +193,7 @@ export function AiProvidersClaudeEditPage() {
   return (
     <SecondaryScreenShell
       ref={swipeRef}
+      contentClassName={layoutStyles.content}
       title={title}
       onBack={handleBack}
       backLabel={t('common.back')}
diff --git a/src/pages/AiProvidersCodexEditPage.tsx b/src/pages/AiProvidersCodexEditPage.tsx
index d62e345..f17faaf 100644
--- a/src/pages/AiProvidersCodexEditPage.tsx
+++ b/src/pages/AiProvidersCodexEditPage.tsx
@@ -14,6 +14,7 @@ import { buildHeaderObject, headersToEntries } from '@/utils/headers';
 import { entriesToModels } from '@/components/ui/ModelInputList';
 import { excludedModelsToText, parseExcludedModels } from '@/components/providers/utils';
 import type { ProviderFormState } from '@/components/providers';
+import layoutStyles from './AiProvidersEditLayout.module.scss';
 
 type LocationState = { fromAiProviders?: boolean } | null;
 
@@ -193,6 +194,7 @@ export function AiProvidersCodexEditPage() {
   return (
     <SecondaryScreenShell
       ref={swipeRef}
+      contentClassName={layoutStyles.content}
       title={title}
       onBack={handleBack}
       backLabel={t('common.back')}
diff --git a/src/pages/AiProvidersEditLayout.module.scss b/src/pages/AiProvidersEditLayout.module.scss
new file mode 100644
index 0000000..ae30069
--- /dev/null
+++ b/src/pages/AiProvidersEditLayout.module.scss
@@ -0,0 +1,5 @@
+.content {
+  width: 100%;
+  max-width: 960px;
+  margin: 0 auto;
+}
diff --git a/src/pages/AiProvidersGeminiEditPage.tsx b/src/pages/AiProvidersGeminiEditPage.tsx
index 4e00590..0a7c620 100644
--- a/src/pages/AiProvidersGeminiEditPage.tsx
+++ b/src/pages/AiProvidersGeminiEditPage.tsx
@@ -13,6 +13,7 @@ import type { GeminiKeyConfig } from '@/types';
 import { buildHeaderObject, headersToEntries } from '@/utils/headers';
 import { excludedModelsToText, parseExcludedModels } from '@/components/providers/utils';
 import type { GeminiFormState } from '@/components/providers';
+import layoutStyles from './AiProvidersEditLayout.module.scss';
 
 type LocationState = { fromAiProviders?: boolean } | null;
 
@@ -176,6 +177,7 @@ export function AiProvidersGeminiEditPage() {
   return (
     <SecondaryScreenShell
       ref={swipeRef}
+      contentClassName={layoutStyles.content}
       title={title}
       onBack={handleBack}
       backLabel={t('common.back')}
diff --git a/src/pages/AiProvidersOpenAIEditPage.tsx b/src/pages/AiProvidersOpenAIEditPage.tsx
index 2c48314..4abd996 100644
--- a/src/pages/AiProvidersOpenAIEditPage.tsx
+++ b/src/pages/AiProvidersOpenAIEditPage.tsx
@@ -15,6 +15,7 @@ import { buildHeaderObject } from '@/utils/headers';
 import { buildApiKeyEntry, buildOpenAIChatCompletionsEndpoint } from '@/components/providers/utils';
 import type { OpenAIEditOutletContext } from './AiProvidersOpenAIEditLayout';
 import styles from './AiProvidersPage.module.scss';
+import layoutStyles from './AiProvidersEditLayout.module.scss';
 
 const OPENAI_TEST_TIMEOUT_MS = 30_000;
 
@@ -229,6 +230,7 @@ export function AiProvidersOpenAIEditPage() {
   return (
     <SecondaryScreenShell
       ref={swipeRef}
+      contentClassName={layoutStyles.content}
       title={title}
       onBack={handleBack}
       backLabel={t('common.back')}
@@ -370,4 +372,3 @@ export function AiProvidersOpenAIEditPage() {
     </SecondaryScreenShell>
   );
 }
-
diff --git a/src/pages/AiProvidersOpenAIModelsPage.tsx b/src/pages/AiProvidersOpenAIModelsPage.tsx
index 8a10b0b..2bdf2ac 100644
--- a/src/pages/AiProvidersOpenAIModelsPage.tsx
+++ b/src/pages/AiProvidersOpenAIModelsPage.tsx
@@ -12,6 +12,7 @@ import { buildHeaderObject } from '@/utils/headers';
 import { buildOpenAIModelsEndpoint } from '@/components/providers/utils';
 import type { OpenAIEditOutletContext } from './AiProvidersOpenAIEditLayout';
 import styles from './AiProvidersPage.module.scss';
+import layoutStyles from './AiProvidersEditLayout.module.scss';
 
 const getErrorMessage = (err: unknown) => {
   if (err instanceof Error) return err.message;
@@ -138,6 +139,7 @@ export function AiProvidersOpenAIModelsPage() {
   return (
     <SecondaryScreenShell
       ref={swipeRef}
+      contentClassName={layoutStyles.content}
       title={t('ai_providers.openai_models_fetch_title')}
       onBack={handleBack}
       backLabel={t('common.back')}
@@ -219,4 +221,3 @@ export function AiProvidersOpenAIModelsPage() {
     </SecondaryScreenShell>
   );
 }
-
diff --git a/src/pages/AiProvidersVertexEditPage.tsx b/src/pages/AiProvidersVertexEditPage.tsx
index 9f46621..de15a66 100644
--- a/src/pages/AiProvidersVertexEditPage.tsx
+++ b/src/pages/AiProvidersVertexEditPage.tsx
@@ -13,6 +13,7 @@ import { useAuthStore, useConfigStore, useNotificationStore } from '@/stores';
 import type { ProviderKeyConfig } from '@/types';
 import { buildHeaderObject, headersToEntries } from '@/utils/headers';
 import type { VertexFormState } from '@/components/providers';
+import layoutStyles from './AiProvidersEditLayout.module.scss';
 
 type LocationState = { fromAiProviders?: boolean } | null;
 
@@ -200,6 +201,7 @@ export function AiProvidersVertexEditPage() {
   return (
     <SecondaryScreenShell
       ref={swipeRef}
+      contentClassName={layoutStyles.content}
       title={title}
       onBack={handleBack}
       backLabel={t('common.back')}