diff --git a/surfsense_web/components/assistant-ui/chat-viewport.tsx b/surfsense_web/components/assistant-ui/chat-viewport.tsx
index f91a8916a..a1534df01 100644
--- a/surfsense_web/components/assistant-ui/chat-viewport.tsx
+++ b/surfsense_web/components/assistant-ui/chat-viewport.tsx
@@ -23,22 +23,24 @@ export interface ChatViewportProps {
 }
 
 export const ChatViewport: FC<ChatViewportProps> = ({ children, footer }) => (
-	<ThreadPrimitive.Viewport
-		scrollToBottomOnRunStart
-		scrollToBottomOnInitialize
-		scrollToBottomOnThreadSwitch
-		className="aui-thread-viewport relative flex flex-1 min-h-0 flex-col overflow-y-auto px-4 pt-4"
-		style={{ scrollbarGutter: "stable" }}
-	>
-		{children}
+	<>
+		<ThreadPrimitive.Viewport
+			scrollToBottomOnRunStart
+			scrollToBottomOnInitialize
+			scrollToBottomOnThreadSwitch
+			className="aui-thread-viewport relative flex flex-1 min-h-0 flex-col overflow-y-auto px-4 pt-4"
+			style={{ scrollbarGutter: "stable" }}
+		>
+			{children}
+		</ThreadPrimitive.Viewport>
 		{footer ? (
-			<ThreadPrimitive.ViewportFooter
-				className="aui-thread-viewport-footer sticky bottom-0 z-10 mx-auto flex w-full max-w-(--thread-max-width) flex-col gap-4 overflow-visible rounded-t-3xl bg-main-panel pb-4 md:pb-6"
+			<div
+				className="aui-chat-composer-area relative mx-auto flex w-full max-w-(--thread-max-width) flex-col gap-4 overflow-visible bg-main-panel px-4 pt-2 pb-4 md:pb-6"
 				style={{ paddingBottom: "max(1rem, env(safe-area-inset-bottom))" }}
 			>
 				<ChatScrollToBottom />
 				{footer}
-			</ThreadPrimitive.ViewportFooter>
+			</div>
 		) : null}
-	</ThreadPrimitive.Viewport>
+	</>
 );
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 1d24a2a39..6c02a1efa 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -113,14 +113,10 @@ const ThreadContent: FC = () => {
 		>
 			<ChatViewport
 				footer={
-					<>
-						<AuiIf condition={({ thread }) => !thread.isEmpty}>
-							<PremiumQuotaPinnedAlert />
-						</AuiIf>
-						<AuiIf condition={({ thread }) => !thread.isEmpty}>
-							<Composer />
-						</AuiIf>
-					</>
+					<AuiIf condition={({ thread }) => !thread.isEmpty}>
+						<PremiumQuotaPinnedAlert />
+						<Composer />
+					</AuiIf>
 				}
 			>
 				<AuiIf condition={({ thread }) => thread.isEmpty}>
diff --git a/surfsense_web/components/public-chat/public-thread.tsx b/surfsense_web/components/public-chat/public-thread.tsx
index de91b4451..750b7410e 100644
--- a/surfsense_web/components/public-chat/public-thread.tsx
+++ b/surfsense_web/components/public-chat/public-thread.tsx
@@ -59,7 +59,7 @@ export const PublicThread: FC<PublicThreadProps> = ({ footer }) => {
 			</ThreadPrimitive.Viewport>
 
 			{footer && (
-				<div className="sticky bottom-0 z-20 border-t bg-main-panel/95 backdrop-blur supports-backdrop-filter:bg-main-panel/60">
+				<div className="border-t bg-main-panel/95 backdrop-blur supports-backdrop-filter:bg-main-panel/60">
 					{footer}
 				</div>
 			)}