diff --git a/iphone/Maps/Classes/SearchVC.mm b/iphone/Maps/Classes/SearchVC.mm
index 56fb304bd4..484ae8a0a6 100644
--- a/iphone/Maps/Classes/SearchVC.mm
+++ b/iphone/Maps/Classes/SearchVC.mm
@@ -100,6 +100,12 @@ static void OnSearchResultCallback(search::Result const & res, int queryId)
   g_searchVC = nil;
 }
 
+- (void)viewWillDisappear:(BOOL)animated
+{
+  // hide keyboard immediately
+  [self.navigationItem.titleView resignFirstResponder];
+}
+
 - (void)searchBar:(UISearchBar *)sender textDidChange:(NSString *)searchText
 {
   [self clearResults];