diff --git a/frontend/src/components/thread/chat-input/file-upload-handler.tsx b/frontend/src/components/thread/chat-input/file-upload-handler.tsx
index 9f37fa03..0ca9b0f5 100644
--- a/frontend/src/components/thread/chat-input/file-upload-handler.tsx
+++ b/frontend/src/components/thread/chat-input/file-upload-handler.tsx
@@ -216,7 +216,7 @@ export const FileUploadHandler = forwardRef<
                 ) : (
                   <Paperclip className="h-4 w-4" />
                 )}
-                <span className="text-sm">Attachments</span>
+                <span className="text-sm sm:block hidden">Attachments</span>
               </Button>
             </TooltipTrigger>
             <TooltipContent side="top">
diff --git a/frontend/src/components/thread/chat-input/model-selector.tsx b/frontend/src/components/thread/chat-input/model-selector.tsx
index 811c2b97..ba674f69 100644
--- a/frontend/src/components/thread/chat-input/model-selector.tsx
+++ b/frontend/src/components/thread/chat-input/model-selector.tsx
@@ -523,8 +523,8 @@ export const ModelSelector: React.FC<ModelSelectorProps> = ({
                   </Tooltip>
                 </TooltipProvider>
               )}
-              <span>{selectedLabel}</span>
-              <ChevronDown className="h-3 w-3 opacity-50 ml-1" />
+              <span className="truncate max-w-[120px] sm:max-w-[160px] md:max-w-[200px] lg:max-w-none">{selectedLabel}</span>
+              <ChevronDown className="h-3 w-3 opacity-50 ml-1 flex-shrink-0" />
             </div>
           </Button>
         </DropdownMenuTrigger>