diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
index a0f1a44bdb..7a0dfb5929 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Search/MWMSearchManager.mm
@@ -237,7 +237,11 @@ extern NSString * const kAlohalyticsTapEventKey;
 
 - (void)changeToMapSearchState
 {
-  PinClickManager & bm = GetFramework().GetBalloonManager();
+  Framework & f = GetFramework();
+  UITextField * textField = self.searchTextField;
+  f.SaveSearchQuery(make_pair(textField.textInputMode.primaryLanguage.UTF8String,
+                              textField.text.precomposedStringWithCompatibilityMapping.UTF8String));
+  PinClickManager & bm = f.GetBalloonManager();
   bm.RemovePin();
   bm.Dismiss();
   [self.searchTextField resignFirstResponder];