diff --git a/web-app/src/containers/ChatInput.tsx b/web-app/src/containers/ChatInput.tsx
index 0b34d0d3a..c5743647b 100644
--- a/web-app/src/containers/ChatInput.tsx
+++ b/web-app/src/containers/ChatInput.tsx
@@ -621,10 +621,10 @@ const ChatInput = ({ model, className, initialMessage }: ChatInputProps) => {
 
         <div className="absolute z-20 bg-transparent bottom-0 w-full p-2 ">
           <div className="flex justify-between items-center w-full">
-            <div className="px-1 flex items-center gap-1">
+            <div className="px-1 flex items-center gap-1 flex-1 min-w-0">
               <div
                 className={cn(
-                  'px-1 flex items-center',
+                  'px-1 flex items-center w-full',
                   streamingContent && 'opacity-50 pointer-events-none'
                 )}
               >
diff --git a/web-app/src/containers/DropdownModelProvider.tsx b/web-app/src/containers/DropdownModelProvider.tsx
index 2023b1d6b..02b90d958 100644
--- a/web-app/src/containers/DropdownModelProvider.tsx
+++ b/web-app/src/containers/DropdownModelProvider.tsx
@@ -461,11 +461,11 @@ const DropdownModelProvider = ({
 
   return (
     <Popover open={open} onOpenChange={onOpenChange}>
-      <div className="bg-main-view-fg/5 hover:bg-main-view-fg/8 px-2 py-1 flex items-center gap-1.5 rounded-sm max-h-[32px] mr-0.5">
+      <div className="flex items-center gap-1.5 w-full">
         <PopoverTrigger asChild>
           <button
-            title={displayModel}
-            className="font-medium cursor-pointer flex items-center gap-1.5 relative z-20 max-w-38"
+            type="button"
+            className="font-medium cursor-pointer flex items-center gap-1.5 relative z-20 w-full"
           >
             {provider && (
               <div className="shrink-0">
@@ -575,7 +575,7 @@ const DropdownModelProvider = ({
                                 provider={searchableModel.provider}
                               />
                             </div>
-                            <span className="truncate text-main-view-fg/80 text-sm">
+                            <span className="text-main-view-fg/80 text-sm">
                               {searchableModel.model.id}
                             </span>
                             <div className="flex-1"></div>
@@ -613,7 +613,7 @@ const DropdownModelProvider = ({
                       <div className="flex items-center justify-between px-2 py-1">
                         <div className="flex items-center gap-1.5">
                           <ProvidersAvatar provider={providerInfo} />
-                          <span className="capitalize truncate text-sm font-medium text-main-view-fg/80">
+                          <span className="capitalize text-sm font-medium text-main-view-fg/80">
                             {getProviderTitle(providerInfo.provider)}
                           </span>
                         </div>
@@ -666,12 +666,11 @@ const DropdownModelProvider = ({
                             >
                               <div className="flex items-center gap-2 flex-1 min-w-0">
                                 <span
-                                  className="truncate text-main-view-fg/80 text-sm"
+                                  className="text-main-view-fg/80 text-sm"
                                   title={searchableModel.model.id}
                                 >
                                   {searchableModel.model.id}
                                 </span>
-
                                 <div className="flex-1"></div>
                                 {capabilities.length > 0 && (
                                   <div className="flex-shrink-0 -mr-1.5">