diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index e1e28b09d0..0f9f22fafd 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -395,6 +395,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
     self.controlsManager.menuState = self.controlsManager.menuRestoreState;
 
   [self updateStatusBarStyle];
+  GetFramework().SetRenderingEnabled();
   GetFramework().InvalidateRendering();
   [self showViralAlertIfNeeded];
   [self checkAuthorization];
@@ -488,6 +489,7 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
   if ([MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden &&
       [MWMSearchManager manager].state == MWMSearchManagerStateHidden)
     self.controlsManager.menuRestoreState = self.controlsManager.menuState;
+  GetFramework().SetRenderingDisabled(false);
 }
 
 - (BOOL)prefersStatusBarHidden {
diff --git a/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift b/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift
index 7b401226a6..45132ac772 100644
--- a/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift
+++ b/iphone/Maps/UI/Downloader/DownloadMapsViewController.swift
@@ -76,7 +76,6 @@ class DownloadMapsViewController: MWMViewController {
       let addMapsButton = button(with: UIImage(named: "ic_nav_bar_add"), action: #selector(onAddMaps))
       navigationItem.rightBarButtonItem = addMapsButton
     }
-    Storage.shared().add(self)
     noMapsContainer.isHidden = !dataSource.isEmpty || Storage.shared().downloadInProgress()
     if !dataSource.isRoot {
       searchBarTopOffset.constant = -searchBar.frame.height
@@ -88,7 +87,15 @@ class DownloadMapsViewController: MWMViewController {
 
   override func viewWillAppear(_ animated: Bool) {
     super.viewWillAppear(animated)
-    configButtons()
+    dataSource.reload {
+      reloadData()
+    }
+    Storage.shared().add(self)
+  }
+
+  override func viewDidDisappear(_ animated: Bool) {
+    super.viewDidDisappear(animated)
+    Storage.shared().remove(self)
   }
 
   fileprivate func showChildren(_ nodeAttrs: MapNodeAttributes) {