diff --git a/frontend/src/components/ui/auto-expanding-textarea.tsx b/frontend/src/components/ui/auto-expanding-textarea.tsx
index 85be1ca4..71ec2160 100644
--- a/frontend/src/components/ui/auto-expanding-textarea.tsx
+++ b/frontend/src/components/ui/auto-expanding-textarea.tsx
@@ -50,7 +50,7 @@ const AutoExpandingTextarea = React.forwardRef<
     // Handle keyboard shortcuts
     const handleKeyDown = React.useCallback(
       (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
-        if (e.key === 'Enter') {
+        if (e.key === 'Enter' && !e.nativeEvent.isComposing) {
           if (e.metaKey && e.shiftKey) {
             onCommandShiftEnter?.(e);
           } else if (e.metaKey) {
diff --git a/frontend/src/components/ui/input.tsx b/frontend/src/components/ui/input.tsx
index 342f39da..9e5a3e40 100644
--- a/frontend/src/components/ui/input.tsx
+++ b/frontend/src/components/ui/input.tsx
@@ -23,7 +23,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
       if (e.key === 'Escape') {
         e.currentTarget.blur();
       }
-      if (e.key === 'Enter') {
+      if (e.key === 'Enter' && !e.nativeEvent.isComposing) {
         if (e.metaKey && e.shiftKey) {
           onCommandShiftEnter?.(e);
         } else {