diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm
index 43c93eb1ef..e2050102c1 100644
--- a/iphone/Maps/Classes/MapsAppDelegate.mm
+++ b/iphone/Maps/Classes/MapsAppDelegate.mm
@@ -658,6 +658,9 @@ void InitLocalizedStrings()
   pageControl.pageIndicatorTintColor = [UIColor blackHintText];
   pageControl.currentPageIndicatorTintColor = [UIColor blackSecondaryText];
   pageControl.backgroundColor = [UIColor white];
+
+  UITextField * textField = [UITextField appearance];
+  textField.keyboardAppearance = [UIColor isNightMode] ? UIKeyboardAppearanceDark : UIKeyboardAppearanceDefault;
 }