diff --git a/libs/ui/src/lib/input/AmharicDatePicker.tsx b/libs/ui/src/lib/input/AmharicDatePicker.tsx
index 27f870b5d..bf0cb0324 100644
--- a/libs/ui/src/lib/input/AmharicDatePicker.tsx
+++ b/libs/ui/src/lib/input/AmharicDatePicker.tsx
@@ -273,7 +273,12 @@ export function AmharicDatePicker({
         />
       </Popover.Target>
 
-      <Popover.Dropdown p="md">
+      {/* Inside a Modal there may not be room below the field for the full
+          calendar + time input + action row — scroll the dropdown itself
+          rather than relying on the page (which doesn't scroll while a
+          Modal is open) or the Modal body (the dropdown is portaled out of
+          it, so its scroll never reaches this). */}
+      <Popover.Dropdown p="md" mah="70dvh" style={{ overflowY: 'auto' }}>
         {calendarType === 'AMH' ? (
           <EthiopicDayPicker
             className="amharic-daypicker"