diff --git a/src/components/PopoverWithMeasuredContent.js b/src/components/PopoverWithMeasuredContent.js
index 09643f6b4c12..492807274d1e 100644
--- a/src/components/PopoverWithMeasuredContent.js
+++ b/src/components/PopoverWithMeasuredContent.js
@@ -131,7 +131,7 @@ function PopoverWithMeasuredContent(props) {
     const verticalShift = computeVerticalShift(adjustedAnchorPosition.top, popoverHeight, windowHeight);
     const shiftedAnchorPosition = {
         left: adjustedAnchorPosition.left + horizontalShift,
-        top: adjustedAnchorPosition.top + verticalShift,
+        bottom: windowHeight - (adjustedAnchorPosition.top + popoverHeight) - verticalShift,
     };
     return isContentMeasured ? (
         <Popover
@@ -139,7 +139,7 @@ function PopoverWithMeasuredContent(props) {
             {...props}
             anchorPosition={shiftedAnchorPosition}
         >
-            {props.children}
+            <View onLayout={measurePopover}>{props.children}</View>
         </Popover>
     ) : (
         /*