diff --git a/ui/desktop/package-lock.json b/ui/desktop/package-lock.json
index 0c9ff2ad3c76..a0e46b41e4bb 100644
--- a/ui/desktop/package-lock.json
+++ b/ui/desktop/package-lock.json
@@ -18,7 +18,7 @@
         "@radix-ui/react-icons": "^1.3.1",
         "@radix-ui/react-popover": "^1.1.6",
         "@radix-ui/react-radio-group": "^1.2.3",
-        "@radix-ui/react-scroll-area": "^1.2.0",
+        "@radix-ui/react-scroll-area": "^1.2.9",
         "@radix-ui/react-select": "^2.1.7",
         "@radix-ui/react-slot": "^1.1.1",
         "@radix-ui/react-tabs": "^1.1.1",
diff --git a/ui/desktop/package.json b/ui/desktop/package.json
index d49f87964611..ea7252fce4ee 100644
--- a/ui/desktop/package.json
+++ b/ui/desktop/package.json
@@ -43,7 +43,7 @@
     "@radix-ui/react-icons": "^1.3.1",
     "@radix-ui/react-popover": "^1.1.6",
     "@radix-ui/react-radio-group": "^1.2.3",
-    "@radix-ui/react-scroll-area": "^1.2.0",
+    "@radix-ui/react-scroll-area": "^1.2.9",
     "@radix-ui/react-select": "^2.1.7",
     "@radix-ui/react-slot": "^1.1.1",
     "@radix-ui/react-tabs": "^1.1.1",
diff --git a/ui/desktop/src/components/PopularChatTopics.tsx b/ui/desktop/src/components/PopularChatTopics.tsx
index 7fd321530edd..912a36c5cd8b 100644
--- a/ui/desktop/src/components/PopularChatTopics.tsx
+++ b/ui/desktop/src/components/PopularChatTopics.tsx
@@ -42,7 +42,7 @@ export default function PopularChatTopics({ append }: PopularChatTopicsProps) {
   };
 
   return (
-    <div className="absolute bottom-0 left-0 p-6 max-w-md">
+    <div className="absolute bottom-0 left-0 p-6 w-full">
       <h3 className="text-text-muted text-sm mb-1">Popular chat topics</h3>
       <div className="space-y-1">
         {POPULAR_TOPICS.map((topic) => (
diff --git a/ui/desktop/src/components/cli/CLIHub.tsx b/ui/desktop/src/components/cli/CLIHub.tsx
index 97e9755ce704..fb8ab46c0b94 100644
--- a/ui/desktop/src/components/cli/CLIHub.tsx
+++ b/ui/desktop/src/components/cli/CLIHub.tsx
@@ -97,7 +97,7 @@ export const CLIHub: React.FC<CLIHubProps> = ({ chat, setChat, setView }) => {
       </div>
 
       {/* CLI Chat View */}
-      <div className="flex flex-col min-w-0 flex-1 overflow-y-scroll relative pl-6 pr-4 pb-16 pt-2">
+      <div className="flex flex-col min-w-0 flex-1 overflow-y-auto relative pl-6 pr-4 pb-16 pt-2">
         <CLIChatView sessionId={sessionId} />
       </div>
 
diff --git a/ui/desktop/src/components/extensions/ExtensionsView.tsx b/ui/desktop/src/components/extensions/ExtensionsView.tsx
index 41f53938676f..0d7e08808852 100644
--- a/ui/desktop/src/components/extensions/ExtensionsView.tsx
+++ b/ui/desktop/src/components/extensions/ExtensionsView.tsx
@@ -52,7 +52,7 @@ export default function ExtensionsView({
 
   return (
     <MainPanelLayout>
-      <div className="flex flex-col min-w-0 flex-1 overflow-y-scroll relative">
+      <div className="flex flex-col min-w-0 flex-1 overflow-y-auto relative">
         <div className="bg-background-default px-8 pb-4 pt-16">
           <div className="flex flex-col animate-in fade-in duration-500">
             <div className="flex justify-between items-center mb-1">