diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 21cf2af84..4cdefffa5 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -145,6 +145,8 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
 
 - (void)statePrepare {
   self.navigationInfoView.state = MWMNavigationInfoViewStatePrepare;
+  if (self.searchManager.isSearching)
+    [self.navigationInfoView setSearchState:NavigationSearchState::MinimizedSearch animated:YES];
   auto routePreview = self.routePreview;
   [routePreview addToView:self.ownerView];
   [routePreview statePrepare];
@@ -252,7 +254,8 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
       break;
     case SearchOnMapStateHidden:
     case SearchOnMapStateSearching:
-      [self setMapSearch];
+      [self.navigationInfoView setSearchState:NavigationSearchState::MinimizedSearch animated:YES];
+      break;
   }
 }
 
@@ -349,10 +352,6 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
   return _entity;
 }
 
-- (void)setMapSearch {
-  [_navigationInfoView setMapSearch];
-}
-
 #pragma mark - MWMRoutePreviewDelegate
 
 - (void)routePreviewDidPressDrivingOptions:(MWMRoutePreview *)routePreview {
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h
index 5ea9e94c7..7b1bbf9f5 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.h
@@ -29,8 +29,6 @@ typedef NS_ENUM(NSUInteger, MWMNavigationInfoViewState) {
 
 - (void)onNavigationInfoUpdated:(MWMNavigationDashboardEntity *)info;
 
-- (void)setMapSearch;
-
 - (void)updateToastView;
 
 @end
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
index 613e2ca35..f69d3eec0 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/MWMNavigationInfoView.mm
@@ -100,9 +100,6 @@ BOOL defaultOrientation(CGSize const &size) {
 
 @implementation MWMNavigationInfoView
 
-- (void)setMapSearch {
-  [self setSearchState:NavigationSearchState::MinimizedSearch animated:YES];
-}
 - (void)updateToastView {
   // -S-F-L -> Start
   // -S-F+L -> Finish