diff --git a/UI_V2/pages/home/home.py b/UI_V2/pages/home/home.py
index 99d89da..48ef9b1 100644
--- a/UI_V2/pages/home/home.py
+++ b/UI_V2/pages/home/home.py
@@ -199,7 +199,8 @@ class Home:
                     self.chat_header,
                     ft.Divider(),
                     ft.Container(
-                        height=280,  # chat messages area height
+                        height=280 if self.page.width > 500 else None,  # chat messages area height
+                        expand = True if self.page.width < 500 else None,
                         content=self.messages_list,
                     ),
                     ft.Divider(),
@@ -235,7 +236,8 @@ class Home:
                     )
                 ],
                 width=400,
-                height=500
+                height=500 if self.page.width > 500 else None,
+                scroll=ft.ScrollMode.ADAPTIVE
             ),
             # Optional: set this to True if you want click-outside to close
             enable_drag=True,