diff --git a/webview-ui/src/components/ChatView.tsx b/webview-ui/src/components/ChatView.tsx
index f5241b6e50..640b03a036 100644
--- a/webview-ui/src/components/ChatView.tsx
+++ b/webview-ui/src/components/ChatView.tsx
@@ -287,7 +287,8 @@ const ChatView = ({
 	}
 
 	const handleKeyDown = (event: KeyboardEvent<HTMLTextAreaElement>) => {
-		if (event.key === "Enter" && !event.shiftKey) {
+		const isComposing = event.nativeEvent?.isComposing ?? false
+		if (event.key === "Enter" && !event.shiftKey && !isComposing) {
 			event.preventDefault()
 			handleSendMessage()
 		}