diff --git a/src/activate/registerCommands.ts b/src/activate/registerCommands.ts
index 41c127333d85..46efae1ba9bf 100644
--- a/src/activate/registerCommands.ts
+++ b/src/activate/registerCommands.ts
@@ -97,9 +97,6 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt
 		await visibleProvider.removeClineFromStack()
 		await visibleProvider.refreshWorkspace()
 		await visibleProvider.postMessageToWebview({ type: "action", action: "chatButtonClicked" })
-		// Send focusInput action immediately after chatButtonClicked
-		// This ensures the focus happens after the view has switched
-		await visibleProvider.postMessageToWebview({ type: "action", action: "focusInput" })
 	},
 	mcpButtonClicked: () => {
 		const visibleProvider = getVisibleProviderOrLog(outputChannel)
@@ -197,9 +194,13 @@ const getCommandsMap = ({ context, outputChannel, provider }: RegisterCommandOpt
 		try {
 			await focusPanel(tabPanel, sidebarPanel)
 
-			// Send focus input message only for sidebar panels
-			if (sidebarPanel && getPanel() === sidebarPanel) {
-				provider.postMessageToWebview({ type: "action", action: "focusInput" })
+			// Send focus input message to webview after panel becomes focusable
+			// Use setTimeout to defer until after the panel reveal/focus completes
+			const activePanel = getPanel()
+			if (activePanel) {
+				setTimeout(() => {
+					provider.postMessageToWebview({ type: "action", action: "focusInput" })
+				}, 0)
 			}
 		} catch (error) {
 			outputChannel.appendLine(`Error focusing input: ${error}`)
diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index b454c97bef96..9a2a122e1b88 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -787,11 +787,15 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 					switch (message.action!) {
 						case "didBecomeVisible":
 							if (!isHidden && !sendingDisabled && !enableButtons) {
-								textAreaRef.current?.focus()
+								requestAnimationFrame(() => {
+									textAreaRef.current?.focus()
+								})
 							}
 							break
 						case "focusInput":
-							textAreaRef.current?.focus()
+							requestAnimationFrame(() => {
+								textAreaRef.current?.focus()
+							})
 							break
 					}
 					break