diff --git a/web/app/src/components/conversations/ConversationSplitView.tsx b/web/app/src/components/conversations/ConversationSplitView.tsx
index ce0cf795d5..d07b5fcc82 100644
--- a/web/app/src/components/conversations/ConversationSplitView.tsx
+++ b/web/app/src/components/conversations/ConversationSplitView.tsx
@@ -565,9 +565,10 @@ export function ConversationSplitView() {
                 value={searchQuery}
                 onChange={setSearchQuery}
                 onSearch={handleSearch}
-                placeholder="Search conversations..."
-                className="flex-1"
+                placeholder="Search"
+                className="flex-1 min-w-0"
               />
+
               <DateFilter
                 selectedDate={filterDate}
                 onDateChange={handleDateFilterChange}
@@ -576,7 +577,7 @@ export function ConversationSplitView() {
               <button
                 onClick={isSelectionMode ? exitSelectionMode : enterSelectionMode}
                 className={cn(
-                  'flex items-center gap-1.5 px-3 py-1.5 rounded-lg flex-shrink-0',
+                  'flex items-center gap-1.5 px-3 py-1.5 rounded-lg flex-shrink-0 whitespace-nowrap',
                   'text-sm font-medium transition-colors',
                   isSelectionMode
                     ? 'bg-purple-primary/20 text-purple-primary hover:bg-purple-primary/30'
@@ -666,12 +667,12 @@ export function ConversationSplitView() {
                   {isSearching
                     ? 'No conversations found'
                     : filterDate
-                    ? 'No conversations on this date'
-                    : selectedFolderId === FOLDER_STARRED
-                    ? 'No starred conversations'
-                    : selectedFolderId !== FOLDER_ALL
-                    ? 'No conversations in this folder'
-                    : 'No conversations yet'}
+                      ? 'No conversations on this date'
+                      : selectedFolderId === FOLDER_STARRED
+                        ? 'No starred conversations'
+                        : selectedFolderId !== FOLDER_ALL
+                          ? 'No conversations in this folder'
+                          : 'No conversations yet'}
                 </p>
               </div>
             )}
diff --git a/web/app/src/components/conversations/DateFilter.tsx b/web/app/src/components/conversations/DateFilter.tsx
index 9a9ebbdf8a..6231fad836 100644
--- a/web/app/src/components/conversations/DateFilter.tsx
+++ b/web/app/src/components/conversations/DateFilter.tsx
@@ -173,14 +173,14 @@ export function DateFilter({
       <button
         onClick={() => setIsOpen(!isOpen)}
         className={cn(
-          'flex items-center gap-2 px-3 py-2 rounded-lg',
+          'flex items-center gap-2 px-3 py-2 rounded-lg flex-shrink-0 whitespace-nowrap',
           'text-sm font-medium transition-all duration-150',
           'border',
           isOpen
             ? 'bg-bg-tertiary border-purple-primary/40 text-text-primary'
             : selectedDate
-            ? 'bg-purple-primary/10 border-purple-primary/30 text-purple-primary'
-            : 'bg-transparent border-transparent text-text-secondary hover:bg-bg-tertiary hover:text-text-primary'
+              ? 'bg-purple-primary/10 border-purple-primary/30 text-purple-primary'
+              : 'bg-transparent border-transparent text-text-secondary hover:bg-bg-tertiary hover:text-text-primary'
         )}
       >
         <Calendar className="w-4 h-4" />
diff --git a/web/app/src/components/conversations/SearchBar.tsx b/web/app/src/components/conversations/SearchBar.tsx
index c70dd1ac89..d7bafac49e 100644
--- a/web/app/src/components/conversations/SearchBar.tsx
+++ b/web/app/src/components/conversations/SearchBar.tsx
@@ -97,7 +97,7 @@ export function SearchBar({
     >
       <div
         className={cn(
-          'flex items-center gap-2 px-3 py-2 rounded-lg',
+          'flex items-center gap-2 px-3 py-2 rounded-lg overflow-hidden',
           'bg-bg-secondary border transition-all duration-150',
           isFocused
             ? 'border-purple-primary/40 ring-2 ring-purple-primary/20'