diff --git a/app/components/app-library/ExampleLibraryApps.module.scss b/app/components/app-library/ExampleLibraryApps.module.scss
index fe4b43dd..d891aa34 100644
--- a/app/components/app-library/ExampleLibraryApps.module.scss
+++ b/app/components/app-library/ExampleLibraryApps.module.scss
@@ -1,26 +1,6 @@
 .container {
   width: 100%;
   padding: 1rem;
-  max-height: calc(100vh - 4rem);
-  overflow-y: auto;
-  scrollbar-gutter: stable;
-
-  &::-webkit-scrollbar {
-    width: 8px;
-  }
-
-  &::-webkit-scrollbar-track {
-    background: transparent;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background-color: var(--bolt-elements-borderColor);
-    border-radius: 4px;
-  }
-
-  &::-webkit-scrollbar-thumb:hover {
-    background-color: var(--bolt-elements-textTertiary);
-  }
 }
 
 .grid {
diff --git a/app/components/chat/BaseChat/BaseChat.tsx b/app/components/chat/BaseChat/BaseChat.tsx
index 4d0de4df..f01e0314 100644
--- a/app/components/chat/BaseChat/BaseChat.tsx
+++ b/app/components/chat/BaseChat/BaseChat.tsx
@@ -150,7 +150,9 @@ export const BaseChat = React.forwardRef<HTMLDivElement, BaseChatProps>(
         data-chat-visible={showChat}
       >
         <ClientOnly>{() => <Menu />}</ClientOnly>
-        <div ref={scrollRef} className="flex flex-col lg:flex-row w-full h-full">
+        <div ref={scrollRef} className={classNames("w-full h-full flex flex-col lg:flex-row", {
+          "overflow-y-auto": !chatStarted,
+        })}>
           <div className={classNames(styles.Chat, 'flex flex-col flex-grow lg:min-w-[var(--chat-min-width)] h-full')}>
             {!chatStarted && <IntroSection />}
             <div