diff --git a/frontend/app/brains-management/[brainId]/components/BrainManagementTabs/BrainManagementTabs.tsx b/frontend/app/brains-management/[brainId]/components/BrainManagementTabs/BrainManagementTabs.tsx
index 79ceedc34..6aae51ef1 100644
--- a/frontend/app/brains-management/[brainId]/components/BrainManagementTabs/BrainManagementTabs.tsx
+++ b/frontend/app/brains-management/[brainId]/components/BrainManagementTabs/BrainManagementTabs.tsx
@@ -38,7 +38,7 @@ export const BrainManagementTabs = (): JSX.Element => {
   return (
     <div className="flex justify-center w-full">
       <Root
-        className="flex flex-col w-full h-full overflow-hidden bg-white dark:bg-black p-4 md:p-10 max-w-5xl"
+        className="flex flex-col w-full h-full overflow-scroll bg-white dark:bg-black p-4 md:p-10 max-w-5xl"
         value={selectedTab}
       >
         <List
diff --git a/frontend/app/brains-management/library/page.tsx b/frontend/app/brains-management/library/page.tsx
index ff1ebd2d7..63de7d79d 100644
--- a/frontend/app/brains-management/library/page.tsx
+++ b/frontend/app/brains-management/library/page.tsx
@@ -14,7 +14,7 @@ const BrainsLibrary = (): JSX.Element => {
   const { t } = useTranslation("brain");
 
   return (
-    <div className="flex flex-1 flex-col items-center">
+    <div className="flex flex-1 flex-col items-center overflow-scroll">
       <div className="flex">
         <Field
           value={searchBarText}
diff --git a/frontend/app/chat/[chatId]/page.tsx b/frontend/app/chat/[chatId]/page.tsx
index ba9832b3f..8cdf5dca1 100644
--- a/frontend/app/chat/[chatId]/page.tsx
+++ b/frontend/app/chat/[chatId]/page.tsx
@@ -11,24 +11,22 @@ const SelectedChatPage = (): JSX.Element => {
   const { shouldDisplayFeedCard } = useKnowledgeToFeedContext();
 
   return (
-    <>
+    <div
+      className={`flex flex-col flex-1 items-center justify-stretch w-full h-full overflow-hidden ${
+        shouldDisplayFeedCard ? "bg-chat-bg-gray" : "bg-white"
+      } dark:bg-black transition-colors ease-out duration-500`}
+      data-testid="chat-page"
+      {...getRootProps()}
+    >
       <div
-        className={`flex flex-col flex-1 items-center justify-stretch w-full h-full overflow-hidden ${
-          shouldDisplayFeedCard ? "bg-chat-bg-gray" : "bg-white"
-        } dark:bg-black transition-colors ease-out duration-500`}
-        data-testid="chat-page"
-        {...getRootProps()}
+        className={`flex flex-col flex-1 w-full max-w-5xl h-full dark:shadow-primary/25 overflow-hidden p-2 sm:p-4 md:p-6 lg:p-8`}
       >
-        <div
-          className={`flex flex-col flex-1 w-full max-w-5xl h-full dark:shadow-primary/25 overflow-hidden p-2 sm:p-4 md:p-6 lg:p-8`}
-        >
-          <div className="flex flex-1 flex-col overflow-y-auto">
-            <ChatDialogueArea />
-          </div>
-          <ActionsBar />
+        <div className="flex flex-1 flex-col overflow-y-auto">
+          <ChatDialogueArea />
         </div>
+        <ActionsBar />
       </div>
-    </>
+    </div>
   );
 };