diff --git a/libs/ui/src/lib/input/AmharicDatePicker.tsx b/libs/ui/src/lib/input/AmharicDatePicker.tsx
index d9d256eb0..27f870b5d 100644
--- a/libs/ui/src/lib/input/AmharicDatePicker.tsx
+++ b/libs/ui/src/lib/input/AmharicDatePicker.tsx
@@ -222,10 +222,17 @@ export function AmharicDatePicker({
     <Popover
       opened={opened}
       onChange={close}
-      position="bottom"
+      position="bottom-start"
       width="auto"
       trapFocus
       withArrow
+      withinPortal
+      // Inside a Modal, the target sits in a scrollable container — floating-ui's
+      // default flip middleware measures room against that scroll container, not
+      // the viewport, and flips the dropdown above the field where it runs off
+      // the top of the screen. Keeping it pinned below and letting shift nudge it
+      // sideways instead avoids that.
+      middlewares={{ flip: false, shift: true }}
     >
       <Popover.Target>
         <TextInput