diff --git a/src/components/thread/index.tsx b/src/components/thread/index.tsx
index 8ea169d..bdca168 100644
--- a/src/components/thread/index.tsx
+++ b/src/components/thread/index.tsx
@@ -377,7 +377,12 @@ export function Thread() {
                       value={input}
                       onChange={(e) => setInput(e.target.value)}
                       onKeyDown={(e) => {
-                        if (e.key === "Enter" && !e.shiftKey && !e.metaKey) {
+                        if (
+                          e.key === "Enter" &&
+                          !e.shiftKey &&
+                          !e.metaKey &&
+                          !e.nativeEvent.isComposing
+                        ) {
                           e.preventDefault();
                           const el = e.target as HTMLElement | undefined;
                           const form = el?.closest("form");
diff --git a/src/components/thread/messages/human.tsx b/src/components/thread/messages/human.tsx
index a394874..e6ca4c5 100644
--- a/src/components/thread/messages/human.tsx
+++ b/src/components/thread/messages/human.tsx
@@ -84,7 +84,7 @@ export function HumanMessage({
             onSubmit={handleSubmitEdit}
           />
         ) : (
-          <p className="text-right px-4 py-2 rounded-3xl bg-muted">
+          <p className="text-right px-4 py-2 rounded-3xl bg-muted w-fit ml-auto">
             {contentString}
           </p>
         )}