diff --git a/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte b/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
index 9300068a62..94409673a7 100644
--- a/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
+++ b/tools/server/webui/src/lib/components/app/mcp/McpServerCard/McpServerCard.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
+	import { onMount, tick } from 'svelte';
 	import * as Card from '$lib/components/ui/card';
 	import type { MCPServerSettingsEntry, HealthCheckState } from '$lib/types';
 	import { HealthCheckStatus } from '$lib/enums';
@@ -74,9 +74,10 @@
 		mcpClient.runHealthCheck(server);
 	}
 
-	function startEditing() {
-		editFormRef?.setInitialValues(server.url, server.headers || '');
+	async function startEditing() {
 		isEditing = true;
+		await tick();
+		editFormRef?.setInitialValues(server.url, server.headers || '');
 	}
 
 	function cancelEditing() {
diff --git a/tools/server/webui/src/lib/components/app/mcp/McpServerForm.svelte b/tools/server/webui/src/lib/components/app/mcp/McpServerForm.svelte
index 9fba6702dc..66376692b4 100644
--- a/tools/server/webui/src/lib/components/app/mcp/McpServerForm.svelte
+++ b/tools/server/webui/src/lib/components/app/mcp/McpServerForm.svelte
@@ -25,6 +25,10 @@
 	// Local state for header pairs
 	let headerPairs = $state<KeyValuePair[]>(parseHeadersToArray(headers));
 
+	$effect(() => {
+		headerPairs = parseHeadersToArray(headers);
+	});
+
 	// Sync header pairs to parent when they change
 	function updateHeaderPairs(newPairs: KeyValuePair[]) {
 		headerPairs = newPairs;