diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx
index 9a94d86ea3..3ba4938a57 100644
--- a/webview-ui/src/components/chat/ChatView.tsx
+++ b/webview-ui/src/components/chat/ChatView.tsx
@@ -789,7 +789,8 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				case "action":
 					switch (message.action!) {
 						case "didBecomeVisible":
-							if (!isHidden && !sendingDisabled && !enableButtons) {
+							// Do not grab focus during follow-up questions
+							if (!isHidden && !sendingDisabled && !enableButtons && clineAsk !== "followup") {
 								textAreaRef.current?.focus()
 							}
 							break
@@ -858,6 +859,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			handleSecondaryButtonClick,
 			setCheckpointWarning,
 			playSound,
+			clineAsk,
 		],
 	)
 
@@ -976,12 +978,13 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 
 	useDebounceEffect(
 		() => {
-			if (!isHidden && !sendingDisabled && !enableButtons) {
+			// Do not grab focus during follow-up questions
+			if (!isHidden && !sendingDisabled && !enableButtons && clineAsk !== "followup") {
 				textAreaRef.current?.focus()
 			}
 		},
 		50,
-		[isHidden, sendingDisabled, enableButtons],
+		[isHidden, sendingDisabled, enableButtons, clineAsk],
 	)
 
 	useEffect(() => {
diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json
index 7ddc81a5d7..1f934de329 100644
--- a/webview-ui/src/i18n/locales/de/settings.json
+++ b/webview-ui/src/i18n/locales/de/settings.json
@@ -959,5 +959,6 @@
 		"requireCtrlEnterToSend": {
 			"label": "Erfordert {primaryMod}+Enter zum Senden von Nachrichten",
 			"description": "Wenn aktiviert, musst du {primaryMod}+Enter drücken, um Nachrichten zu senden, anstatt nur Enter."
+		}
 	}
 }
diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json
index 54906f1953..59d216d635 100644
--- a/webview-ui/src/i18n/locales/fr/settings.json
+++ b/webview-ui/src/i18n/locales/fr/settings.json
@@ -954,8 +954,11 @@
 	"ui": {
 		"collapseThinking": {
 			"label": "Réduire les messages de réflexion par défaut",
+			"description": "Lorsque cette option est activée, les blocs de réflexion seront réduits par défaut jusqu'à ce que vous interagissiez avec eux"
+		},
 		"requireCtrlEnterToSend": {
 			"label": "Requiert {primaryMod}+Entrée pour envoyer des messages",
 			"description": "Lorsqu'activé, vous devez appuyer sur {primaryMod}+Entrée pour envoyer des messages au lieu de simplement Entrée"
+		}
 	}
 }
diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json
index f86b59eda5..665340c971 100644
--- a/webview-ui/src/i18n/locales/it/settings.json
+++ b/webview-ui/src/i18n/locales/it/settings.json
@@ -954,11 +954,11 @@
 	},
 	"ui": {
 		"collapseThinking": {
-			"label": "Comprimi i messaggi di pensiero per impostazione predefinita",
+			"label": "Comprimi i messaggi di pensiero per impostazione predefinita"
+		},
 		"requireCtrlEnterToSend": {
 			"label": "Richiedi {primaryMod}+Invio per inviare messaggi",
 			"description": "Quando abilitato, devi premere {primaryMod}+Invio per inviare messaggi invece di solo Invio"
-			"description": "Quando abilitato, devi premere Ctrl+Invio per inviare messaggi invece di solo Invio"
 		}
 	}
 }