diff --git a/platforms/blabsy/src/components/chat/chat-window.tsx b/platforms/blabsy/src/components/chat/chat-window.tsx
index 40084a02..5d5162b2 100644
--- a/platforms/blabsy/src/components/chat/chat-window.tsx
+++ b/platforms/blabsy/src/components/chat/chat-window.tsx
@@ -206,7 +206,7 @@ export function ChatWindow(): JSX.Element {
         <div className='flex h-full flex-col'>
             {currentChat ? (
                 <>
-                    <div className='flex items-center justify-between gap-3 border-b border-gray-200 p-4 dark:border-gray-800'>
+                    <div className='flex h-fit items-center justify-between gap-3 border-b border-gray-200 p-4 dark:border-gray-800'>
                         <div className='flex items-center gap-3'>
                             <div className='relative flex h-10 w-10 items-center justify-center overflow-hidden rounded-full bg-gray-200 dark:bg-gray-700'>
                                 {otherUser?.photoURL ? (
@@ -263,7 +263,7 @@ export function ChatWindow(): JSX.Element {
                             </div>
                         )}
                     </div>
-                    <div className='flex-1 overflow-y-auto p-4'>
+                    <div className='flex-1 p-4 overflow-y-auto'>
                         {isLoading ? (
                             <div className='flex h-full w-full items-center justify-center'>
                                 <Loading className='h-8 w-8' />
diff --git a/platforms/blabsy/src/components/chat/chat.tsx b/platforms/blabsy/src/components/chat/chat.tsx
index a44b2ce2..5d690d3b 100644
--- a/platforms/blabsy/src/components/chat/chat.tsx
+++ b/platforms/blabsy/src/components/chat/chat.tsx
@@ -3,12 +3,12 @@ import { ChatWindow } from './chat-window';
 
 export function Chat(): JSX.Element {
     return (
-        <main className='min-h-screen w-full max-w-5xl mt-8'>
+        <main className='min-h-full w-full max-w-5xl pt-8'>
             <div className='grid h-[calc(100vh-4rem)] grid-cols-1 gap-4 md:grid-cols-[350px_1fr]'>
-                <div className='h-full rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-black'>
+                <div className='max-h-full rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-black'>
                     <ChatList />
                 </div>
-                <div className='h-full rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-black'>
+                <div className='h-[calc(100vh-4rem)] rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-black'>
                     <ChatWindow />
                 </div>
             </div>