From 01cb4f281e63d307bbc4d5a065063714ff4664ff Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Sat, 13 Jun 2026 16:31:03 +0530
Subject: [PATCH] refactor(free-chat): remove FreeModelSelector from
 FreeChatPage and integrate it into FreeComposer for improved layout
 consistency

---
 surfsense_web/components/free-chat/free-chat-page.tsx | 5 -----
 surfsense_web/components/free-chat/free-composer.tsx  | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/surfsense_web/components/free-chat/free-chat-page.tsx b/surfsense_web/components/free-chat/free-chat-page.tsx
index 8d5215fca..8508b3d0c 100644
--- a/surfsense_web/components/free-chat/free-chat-page.tsx
+++ b/surfsense_web/components/free-chat/free-chat-page.tsx
@@ -35,7 +35,6 @@ import {
 } from "@/lib/chat/streaming-state";
 import { BACKEND_URL } from "@/lib/env-config";
 import { trackAnonymousChatMessageSent } from "@/lib/posthog/events";
-import { FreeModelSelector } from "./free-model-selector";
 import { FreeThread } from "./free-thread";
 import { RemoveAdsBanner } from "./remove-ads-banner";
 
@@ -499,10 +498,6 @@ export function FreeChatPage() {
 				<TimelineDataUI />
 				<StepSeparatorDataUI />
 				<div className="flex h-full flex-col overflow-hidden">
-					<div className="flex h-14 shrink-0 items-center justify-between border-b border-border/40 px-4">
-						<FreeModelSelector />
-					</div>
-
 					<RemoveAdsBanner />
 
 					{captchaRequired && TURNSTILE_SITE_KEY && (
diff --git a/surfsense_web/components/free-chat/free-composer.tsx b/surfsense_web/components/free-chat/free-composer.tsx
index 46d9e0259..162b906ad 100644
--- a/surfsense_web/components/free-chat/free-composer.tsx
+++ b/surfsense_web/components/free-chat/free-composer.tsx
@@ -13,6 +13,7 @@ import { useAnonymousMode } from "@/contexts/anonymous-mode";
 import { useLoginGate } from "@/contexts/login-gate";
 import { anonymousChatApiService } from "@/lib/apis/anonymous-chat-api.service";
 import { cn } from "@/lib/utils";
+import { FreeModelSelector } from "./free-model-selector";
 
 const ANON_ALLOWED_EXTENSIONS = new Set([
 	".md",
@@ -227,7 +228,8 @@ export const FreeComposer: FC = () => {
 					</Tooltip>
 				</div>
 
-				<div className="flex items-center gap-1">
+				<div className="flex min-w-0 items-center gap-1">
+					<FreeModelSelector className="h-8 max-w-[44vw] px-2 sm:max-w-[220px] sm:px-3" />
 					{!isRunning ? (
 						<ComposerPrimitive.Send asChild>
 							<TooltipIconButton tooltip="Send" variant="default" className="size-8 rounded-full">