diff --git a/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m b/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m
index cbf6b50be15..86e48cf62ad 100644
--- a/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m
+++ b/Auth/FirebaseAuthUI/FUIAuthPickerViewController.m
@@ -91,6 +91,11 @@ - (instancetype)initWithNibName:(NSString *)nibNameOrNil
 - (void)viewDidLoad {
   [super viewDidLoad];
 
+  // Makes sure that embedded scroll view properly handles translucent navigation bar
+  if (!self.navigationController.navigationBar.isTranslucent) {
+    self.extendedLayoutIncludesOpaqueBars = true;
+  }
+
   if (!self.authUI.shouldHideCancelButton) {
     UIBarButtonItem *cancelBarButton =
         [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel