diff --git a/app/dashboard/activity/page.tsx b/app/dashboard/activity/page.tsx
index ba76dfc..06a0d5e 100644
--- a/app/dashboard/activity/page.tsx
+++ b/app/dashboard/activity/page.tsx
@@ -15,7 +15,7 @@ export default async function ActivityPage() {
   const events = await getRecentEvents(agent.id, 200);
 
   return (
-    <div className="flex flex-col gap-4">
+    <div className="flex h-full min-h-0 flex-col gap-4">
       <Card size="sm">
         <CardHeader>
           <CardTitle className="text-base">Overview</CardTitle>
@@ -25,11 +25,11 @@ export default async function ActivityPage() {
         </CardContent>
       </Card>
 
-      <Card size="sm">
+      <Card size="sm" className="min-h-0 flex-1">
         <CardHeader>
           <CardTitle className="text-base">Activity feed</CardTitle>
         </CardHeader>
-        <CardContent>
+        <CardContent className="min-h-0 flex-1">
           <ActivityFeed events={events} />
         </CardContent>
       </Card>
diff --git a/components/dashboard/activity-feed.tsx b/components/dashboard/activity-feed.tsx
index 13c83c6..5fa86e5 100644
--- a/components/dashboard/activity-feed.tsx
+++ b/components/dashboard/activity-feed.tsx
@@ -42,7 +42,7 @@ export function ActivityFeed({ events }: { events: AgentEvent[] }) {
   }, [events, category]);
 
   return (
-    <div className="flex flex-col gap-4">
+    <div className="flex h-full min-h-0 flex-col gap-4">
       <Select value={category} onValueChange={(value) => value && setCategory(value)}>
         <SelectTrigger className="w-48">
           <SelectValue />
@@ -56,7 +56,7 @@ export function ActivityFeed({ events }: { events: AgentEvent[] }) {
         </SelectContent>
       </Select>
 
-      <ScrollArea className="h-[60vh]">
+      <ScrollArea className="min-h-0 flex-1">
         <div className="flex flex-col gap-3 pr-4">
           {filtered.length === 0 && <p className="text-sm text-muted-foreground">No events yet.</p>}
           {filtered.map((event) => (