diff --git a/src/components/CurrencyPicker.tsx b/src/components/CurrencyPicker.tsx
index 2bb4eb3e0c86..319c899343ba 100644
--- a/src/components/CurrencyPicker.tsx
+++ b/src/components/CurrencyPicker.tsx
@@ -75,12 +75,14 @@ function CurrencyPicker({label, value, errorText, headerContent, excludeCurrenci
                 shouldEnableNewFocusManagement
                 useNativeDriver
                 onBackdropPress={Navigation.dismissModal}
+                shouldUseModalPaddingStyle={false}
             >
                 <ScreenWrapper
                     style={[styles.pb0]}
-                    includePaddingTop={false}
+                    includePaddingTop
                     includeSafeAreaPaddingBottom
                     testID={CurrencyPicker.displayName}
+                    shouldEnableMaxHeight
                 >
                     <HeaderWithBackButton
                         title={label}