diff --git a/src/components/features/conversation/conversation-name-with-status.tsx b/src/components/features/conversation/conversation-name-with-status.tsx
index f535b5a5db..58e71cffe0 100644
--- a/src/components/features/conversation/conversation-name-with-status.tsx
+++ b/src/components/features/conversation/conversation-name-with-status.tsx
@@ -59,8 +59,8 @@ export function ConversationNameWithStatus() {
 
   return (
     <div className="flex items-center justify-between w-full">
-      <div className="flex items-center">
-        <div className="group relative">
+      <div className="flex items-center min-w-0">
+        <div className="group relative shrink-0">
           <DebugStackframeDot
             className="ml-[3.5px] w-6 h-6 cursor-pointer"
             color={statusColor}
diff --git a/src/components/features/conversation/conversation-name.tsx b/src/components/features/conversation/conversation-name.tsx
index d83bf684cf..ba5453b331 100644
--- a/src/components/features/conversation/conversation-name.tsx
+++ b/src/components/features/conversation/conversation-name.tsx
@@ -134,7 +134,7 @@ export function ConversationName() {
   return (
     <>
       <div
-        className="flex items-center gap-2 h-[22px] text-base font-normal text-left pl-0 lg:pl-1"
+        className="flex items-center gap-2 h-[22px] text-base font-normal text-left pl-0 lg:pl-1 min-w-0"
         data-testid="conversation-name"
       >
         {titleMode === "edit" ? (
@@ -150,7 +150,7 @@ export function ConversationName() {
           />
         ) : (
           <div
-            className="text-white leading-5 w-fit max-w-fit truncate"
+            className="text-white leading-5 truncate"
             data-testid="conversation-name-title"
             onDoubleClick={handleDoubleClick}
             title={conversation.title || ""}
@@ -160,7 +160,10 @@ export function ConversationName() {
         )}
 
         {titleMode !== "edit" && (
-          <div ref={ellipsisAnchorRef} className="relative flex items-center">
+          <div
+            ref={ellipsisAnchorRef}
+            className="relative flex items-center shrink-0"
+          >
             <EllipsisButton onClick={handleEllipsisClick} />
             {contextMenuOpen && (
               <ConversationNameContextMenu