diff --git a/web/src/app/chat/components/conversation-starter.tsx b/web/src/app/chat/components/conversation-starter.tsx
index b80e4c10f..f57ca4cd2 100644
--- a/web/src/app/chat/components/conversation-starter.tsx
+++ b/web/src/app/chat/components/conversation-starter.tsx
@@ -19,11 +19,18 @@ export function ConversationStarter({
   const questions = t.raw("conversationStarters") as string[];
 
   return (
-    <div className={cn("flex flex-col items-center", className)}>
-      <div className="pointer-events-none fixed inset-0 flex items-center justify-center">
-        <Welcome className="pointer-events-auto mb-15 w-[75%] -translate-y-24" />
+    <div
+      className={cn(
+        "flex h-full flex-col items-center justify-between overflow-auto",
+        className,
+      )}
+    >
+      {/* Spacer for flex layout - pushes Welcome to center */}
+      <div />
+      <div className="pointer-events-none flex items-center justify-center">
+        <Welcome className="pointer-events-auto mt-14 mb-5 w-[75%]" />
       </div>
-      <ul className="flex flex-wrap">
+      <ul className="mb-6 flex flex-wrap">
         {questions.map((question, index) => (
           <motion.li
             key={`${index}-${question}`}
diff --git a/web/src/app/chat/components/messages-block.tsx b/web/src/app/chat/components/messages-block.tsx
index 31c125f84..83e134e0b 100644
--- a/web/src/app/chat/components/messages-block.tsx
+++ b/web/src/app/chat/components/messages-block.tsx
@@ -87,19 +87,17 @@ export function MessagesBlock({ className }: { className?: string }) {
   }, [fastForwarding]);
   return (
     <div className={cn("flex h-full flex-col", className)}>
-      <MessageListView
-        className="flex flex-grow"
-        onFeedback={handleFeedback}
-        onSendMessage={handleSend}
-      />
+      {responding || messageCount !== 0 || isReplay ? (
+        <MessageListView
+          className="flex flex-grow"
+          onFeedback={handleFeedback}
+          onSendMessage={handleSend}
+        />
+      ) : (
+        <ConversationStarter onSend={handleSend} />
+      )}
       {!isReplay ? (
         <div className="relative flex h-42 shrink-0 pb-4">
-          {!responding && messageCount === 0 && (
-            <ConversationStarter
-              className="absolute top-[-218px] left-0"
-              onSend={handleSend}
-            />
-          )}
           <InputBox
             className="h-full w-full"
             responding={responding}