diff --git a/src/apps/chat/components/message/fragments-content/BlockEdit_TextFragment.tsx b/src/apps/chat/components/message/fragments-content/BlockEdit_TextFragment.tsx
index b4b64c2d8..d09e62b73 100644
--- a/src/apps/chat/components/message/fragments-content/BlockEdit_TextFragment.tsx
+++ b/src/apps/chat/components/message/fragments-content/BlockEdit_TextFragment.tsx
@@ -96,6 +96,8 @@ export function BlockEdit_TextFragment(props: {
 
   const handleEditKeyDown = React.useCallback((e: React.KeyboardEvent<HTMLTextAreaElement>) => {
     if (e.key === 'Enter') {
+      if (e.nativeEvent.isComposing)
+        return;
       const withControl = e.ctrlKey;
       if (enterIsNewline ? e.shiftKey : !e.shiftKey) {
         e.preventDefault();
diff --git a/src/common/components/InlineTextarea.tsx b/src/common/components/InlineTextarea.tsx
index e0ae95fc7..48e659a03 100644
--- a/src/common/components/InlineTextarea.tsx
+++ b/src/common/components/InlineTextarea.tsx
@@ -40,6 +40,8 @@ export function InlineTextarea(props: {
 
   const handleEditKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
     if (e.key === 'Enter') {
+      if (e.nativeEvent.isComposing)
+        return;
       const shiftOrAlt = e.shiftKey || e.altKey;
       if (enterIsNewline ? shiftOrAlt : !shiftOrAlt) {
         e.preventDefault();