diff --git a/client/src/components/Chat/ChatView.tsx b/client/src/components/Chat/ChatView.tsx
index 30b1510e88..9196b3f23c 100644
--- a/client/src/components/Chat/ChatView.tsx
+++ b/client/src/components/Chat/ChatView.tsx
@@ -52,8 +52,10 @@ function ChatView({ index = 0 }: { index?: number }) {
 
   if (isLoading && conversationId !== 'new') {
     content = (
-      <div className="flex h-screen items-center justify-center">
-        <Spinner className="text-text-primary" />
+      <div className="relative flex-1 overflow-hidden overflow-y-auto">
+        <div className="relative flex h-full items-center justify-center">
+          <Spinner className="text-text-primary" />
+        </div>
       </div>
     );
   } else if (!isLandingPage) {