diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm
index 22cf9fa0a2..12f2d1c359 100644
--- a/iphone/Maps/Bookmarks/BookmarksVC.mm
+++ b/iphone/Maps/Bookmarks/BookmarksVC.mm
@@ -160,9 +160,9 @@
       if (bm)
       {
         // Same as "Close".
+        f.ShowBookmark(*bm);
         [self dismissModalViewControllerAnimated:YES];
         [self.navigationController.visibleViewController dismissModalViewControllerAnimated:YES];
-        f.ShowBookmark(*bm);
       }
     }
   }
diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h
index 1e9e6503e9..e5a77a8994 100644
--- a/iphone/Maps/Classes/MapViewController.h
+++ b/iphone/Maps/Classes/MapViewController.h
@@ -24,8 +24,6 @@
   m2::PointD m_touchDownPoint;
 }
 
-- (void) ZoomToRect: (m2::RectD const &) rect;
-
 - (void) SetupMeasurementSystem;
 
 // called when app is terminated by system
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 6ae1e020d5..78083adbd4 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -20,11 +20,6 @@
 @synthesize m_downloadButton;
 @synthesize m_bookmarksButton;
 
-- (void) ZoomToRect: (m2::RectD const &) rect
-{
-  GetFramework().ShowRect(rect);
-}
-
 //********************************************************************************************
 //*********************** Callbacks from LocationManager *************************************
 - (void) onLocationStatusChanged:(location::TLocationStatus)newStatus
@@ -442,8 +437,6 @@ NSInteger compareAddress(id l, id r, void * context)
 
 - (BOOL) shouldAutorotateToInterfaceOrientation: (UIInterfaceOrientation) interfaceOrientation
 {
-  // Update popup bookmark position
-  [self updateDataAfterScreenChanged];
 	return YES; // We support all orientations
 }
 
@@ -475,6 +468,8 @@ NSInteger compareAddress(id l, id r, void * context)
 - (void) didRotateFromInterfaceOrientation: (UIInterfaceOrientation) fromInterfaceOrientation
 {
   [[MapsAppDelegate theApp].m_locationManager setOrientation:self.interfaceOrientation];
+  // Update popup bookmark position
+  [self updateDataAfterScreenChanged];
   [self Invalidate];
 }
 
diff --git a/iphone/Maps/Settings/CountriesViewController.mm b/iphone/Maps/Settings/CountriesViewController.mm
index cf3b9cfeb4..17ad42dfe6 100644
--- a/iphone/Maps/Settings/CountriesViewController.mm
+++ b/iphone/Maps/Settings/CountriesViewController.mm
@@ -123,9 +123,9 @@ static bool IsOurIndex(TIndex const & theirs, TIndex const & ours)
   if (status == EOnDisk || status == EOnDiskOutOfDate)
   {
     m2::RectD const bounds = frm.GetCountryBounds(index);
-    
+
+    GetFramework().ShowRect(bounds);
     [[[MapsAppDelegate theApp] settingsManager] hide];
-    [[MapsAppDelegate theApp].m_mapViewController ZoomToRect:bounds];
   }
 }