diff --git a/frontend/src/components/dashboard/UpcomingWidget.tsx b/frontend/src/components/dashboard/UpcomingWidget.tsx
index 22f1a28..9f26f45 100644
--- a/frontend/src/components/dashboard/UpcomingWidget.tsx
+++ b/frontend/src/components/dashboard/UpcomingWidget.tsx
@@ -164,6 +164,7 @@ export default function UpcomingWidget({ items }: UpcomingWidgetProps) {
       if (isToday(d)) return 'Due today';
       return null; // date shown in header
     }
+    if (item.type === 'event' && item.all_day) return 'All day';
     if (!item.datetime) return null;
     const d = new Date(item.date + 'T00:00:00');
     if (isToday(d)) return getRelativeTime(item.datetime);
@@ -215,7 +216,7 @@ export default function UpcomingWidget({ items }: UpcomingWidgetProps) {
             {focusMode ? 'Nothing for today or tomorrow' : 'Nothing upcoming'}
           </p>
         ) : (
-          <ScrollArea className="flex-1">
+          <ScrollArea className="flex-1 max-h-[400px]">
             <div>
               {dayEntries.map(([dateKey, dayItems], groupIdx) => {
                 const isCollapsed = collapsedDays.has(dateKey);