diff --git a/src/shared/api.ts b/src/shared/api.ts
index b7e598c..f54c54e 100644
--- a/src/shared/api.ts
+++ b/src/shared/api.ts
@@ -63,6 +63,7 @@ export interface ApiHandlerOptions {
 	unboundModelId?: string
 	azureAiEndpoint?: string
 	azureAiKey?: string
+	azureAiModelConfig?: ModelInfo
 	azureAiDeployments?:
 		| {
 				[key: string]: {
diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx
index e5d0609..d1b1a0a 100644
--- a/webview-ui/src/components/settings/ApiOptions.tsx
+++ b/webview-ui/src/components/settings/ApiOptions.tsx
@@ -19,6 +19,7 @@ import {
 	glamaDefaultModelInfo,
 	mistralDefaultModelId,
 	mistralModels,
+	azureAiModelInfoSaneDefaults,
 	openAiModelInfoSaneDefaults,
 	openAiNativeDefaultModelId,
 	openAiNativeModels,
@@ -1564,7 +1565,7 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration) {
 			return {
 				selectedProvider: provider,
 				selectedModelId: apiConfiguration?.apiModelId || "",
-				selectedModelInfo: openAiModelInfoSaneDefaults,
+				selectedModelInfo: azureAiModelInfoSaneDefaults,
 			}
 		case "openai":
 			return {
diff --git a/webview-ui/src/components/settings/AzureAiModelPicker.tsx b/webview-ui/src/components/settings/AzureAiModelPicker.tsx
index f539614..ea7d058 100644
--- a/webview-ui/src/components/settings/AzureAiModelPicker.tsx
+++ b/webview-ui/src/components/settings/AzureAiModelPicker.tsx
@@ -43,7 +43,7 @@ const AzureAiModelPicker: React.FC = () => {
 					{
 						iconName: "refresh",
 						onClick: () =>
-							handleInputChange("openAiCustomModelInfo")({
+							handleInputChange("azureAiModelConfig")({
 								target: { value: azureAiModelInfoSaneDefaults },
 							}),
 					},
@@ -84,7 +84,7 @@ const AzureAiModelPicker: React.FC = () => {
 						<div style={{ display: "flex", flexDirection: "column", gap: "8px" }}>
 							<VSCodeTextField
 								value={
-									apiConfiguration?.openAiCustomModelInfo?.contextWindow?.toString() ||
+									apiConfiguration?.azureAiModelConfig?.contextWindow?.toString() ||
 									azureAiModelInfoSaneDefaults.contextWindow?.toString() ||
 									""
 								}
@@ -92,10 +92,10 @@ const AzureAiModelPicker: React.FC = () => {
 								style={{ width: "100%" }}
 								onChange={(e: any) => {
 									const parsed = parseInt(e.target.value)
-									handleInputChange("openAiCustomModelInfo")({
+									handleInputChange("azureAiModelConfig")({
 										target: {
 											value: {
-												...(apiConfiguration?.openAiCustomModelInfo ||
+												...(apiConfiguration?.azureAiModelConfig ||
 													azureAiModelInfoSaneDefaults),
 												contextWindow:
 													e.target.value === ""