diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index c5c931aa03..8f27ab9ae9 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -1064,6 +1064,7 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
 {
   [UIApplication sharedApplication].idleTimerDisabled = YES;
   [routeView setState:RouteViewStateTurnInstructions animated:YES];
+  self.zoomButtonsView.hidden = NO;
   GetFramework().FollowRoute();
 }
 
@@ -1076,6 +1077,10 @@ extern NSString * const kAlohalyticsTapEventKey = @"$onClick";
 {
   [UIApplication sharedApplication].idleTimerDisabled = NO;
   GetFramework().CloseRouting();
+  bool zoomButtonsEnabled;
+  if (!Settings::Get("ZoomButtonsEnabled", zoomButtonsEnabled))
+    zoomButtonsEnabled = false;
+  self.zoomButtonsView.hidden = !zoomButtonsEnabled;
   [self.routeView setState:RouteViewStateHidden animated:YES];
 }
 
diff --git a/iphone/Maps/Settings/SettingsViewController.mm b/iphone/Maps/Settings/SettingsViewController.mm
index 67e16a775b..c1466c952b 100644
--- a/iphone/Maps/Settings/SettingsViewController.mm
+++ b/iphone/Maps/Settings/SettingsViewController.mm
@@ -90,7 +90,7 @@ typedef NS_ENUM(NSUInteger, Section)
   {
     cell = [tableView dequeueReusableCellWithIdentifier:[SwitchCell className]];
     SwitchCell * customCell = (SwitchCell *)cell;
-    bool on = false;
+    bool on = true;
     (void)Settings::Get("ZoomButtonsEnabled", on);
     customCell.switchButton.on = on;
     customCell.titleLabel.text = L(@"pref_zoom_title");