diff --git a/ui/goose2/src/features/chat/ui/MessageBubble.tsx b/ui/goose2/src/features/chat/ui/MessageBubble.tsx
index 59ffad069c..d6bbe96796 100644
--- a/ui/goose2/src/features/chat/ui/MessageBubble.tsx
+++ b/ui/goose2/src/features/chat/ui/MessageBubble.tsx
@@ -379,7 +379,7 @@ export const MessageBubble = memo(function MessageBubble({
 
   const handleEditKeyDown = useCallback(
     (e: React.KeyboardEvent) => {
-      if (e.key === "Escape") {
+      if (e.key === "Escape" && !e.nativeEvent.isComposing) {
         e.preventDefault();
         onCancelEdit?.();
       } else if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing) {