diff --git a/iphone/Maps/Classes/SearchView.mm b/iphone/Maps/Classes/SearchView.mm
index d84832f1a2..7e22a647f3 100644
--- a/iphone/Maps/Classes/SearchView.mm
+++ b/iphone/Maps/Classes/SearchView.mm
@@ -157,7 +157,8 @@ __weak SearchView * selfPointer;
 
 - (void)setState:(SearchViewState)state animated:(BOOL)animated withCallback:(BOOL)withCallback
 {
-  if (_state == SearchViewStateResults && state == SearchViewStateHidden)
+  // Clear search results on the map when clear in the search bar on the map is pressed or when we reopen search dialog
+  if ((_state == SearchViewStateResults && state == SearchViewStateHidden) || state == SearchViewStateFullscreen)
     [self clearSearchResultsMode];
 
   UIViewAnimationOptions options = UIViewAnimationOptionCurveEaseInOut;