diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 25da13d3af..09b1acd8e4 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -2679,11 +2679,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     if (mFilterController != null)
       mFilterController.resetFilterAndParams();
+    closePlacePage();
   }
 
   @Override
   public void onSearchUpClick(@Nullable String query)
   {
+    closePlacePage();
     showSearch(query);
   }
 
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index 9a52fca7cf..7890bf11fb 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -541,7 +541,7 @@ public class SearchFragment extends BaseMwmFragment
 
     if (!RoutingController.get().isWaitingPoiPick())
       SearchEngine.INSTANCE.showResult(resultIndex);
-
+    SearchEngine.INSTANCE.setQuery(query);
     processSelected(result);
 
     Statistics.INSTANCE.trackEvent(Statistics.EventName.SEARCH_ITEM_CLICKED);