diff --git a/frontend/src/components/MessageInput.tsx b/frontend/src/components/MessageInput.tsx
index eaac1eea..8d44d765 100644
--- a/frontend/src/components/MessageInput.tsx
+++ b/frontend/src/components/MessageInput.tsx
@@ -1,4 +1,10 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+import {
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+} from 'react';
 import { createPortal } from 'react-dom';
 import { useDropzone } from 'react-dropzone';
 import { useTranslation } from 'react-i18next';
@@ -943,9 +949,6 @@ export default function MessageInput({
     setValue(
       buildVoiceDraftValue(voiceBaseValueRef.current, normalizedTranscript),
     );
-    setTimeout(() => {
-      handleInput();
-    }, 0);
   };
 
   const promptVoiceFileFallback = (message: string) => {
@@ -1331,20 +1334,23 @@ export default function MessageInput({
     };
   }, []);
 
-  useEffect(() => {
+  useLayoutEffect(() => {
     handleInput();
+  }, [value, handleInput]);
+
+  useEffect(() => {
+    window.addEventListener('resize', handleInput);
+    return () => window.removeEventListener('resize', handleInput);
   }, [handleInput]);
 
   const handleChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
     setValue(e.target.value);
-    handleInput();
   };
 
   const handleKeyDown = (e: React.KeyboardEvent<HTMLTextAreaElement>) => {
     if (e.key === 'Enter' && !e.shiftKey) {
       e.preventDefault();
       handleSubmit();
-      handleInput();
     }
   };
 
@@ -1583,7 +1589,6 @@ export default function MessageInput({
             tabIndex={1}
             placeholder={t('inputPlaceholder')}
             className="inputbox-style dark:text-foreground dark:placeholder:text-muted-foreground/50 w-full scrollbar-thin overflow-x-hidden overflow-y-auto rounded-t-3xl bg-transparent px-2 text-base leading-tight whitespace-pre-wrap opacity-100 placeholder:text-gray-500 focus:outline-hidden sm:px-3"
-            onInput={handleInput}
             onKeyDown={handleKeyDown}
             onPaste={handlePaste}
             aria-label={t('inputPlaceholder')}
diff --git a/frontend/src/conversation/ConversationBubble.tsx b/frontend/src/conversation/ConversationBubble.tsx
index e0b20c60..8f621dcd 100644
--- a/frontend/src/conversation/ConversationBubble.tsx
+++ b/frontend/src/conversation/ConversationBubble.tsx
@@ -198,11 +198,11 @@ const ConversationBubble = forwardRef<
             </Avatar>
             {!isEditClicked && (
               <>
-                <div className="relative mr-2 flex w-full flex-col">
-                  <div className="mr-2 ml-2 flex max-w-full items-start gap-2 rounded-3xl bg-linear-to-b from-violet-500 to-violet-600 px-5 py-4 text-sm leading-normal wrap-break-word whitespace-pre-wrap text-white sm:text-base">
+                <div className="relative mr-2 flex w-full min-w-0 flex-col">
+                  <div className="mr-2 ml-2 flex max-w-full min-w-0 items-start gap-2 rounded-3xl bg-linear-to-b from-violet-500 to-violet-600 px-5 py-4 text-sm leading-normal wrap-anywhere whitespace-pre-wrap text-white sm:text-base">
                     <div
                       ref={messageRef}
-                      className={`${isQuestionCollapsed ? 'line-clamp-4' : ''} w-full`}
+                      className={`${isQuestionCollapsed ? 'line-clamp-4' : ''} w-full min-w-0`}
                     >
                       {message}
                     </div>