diff --git a/android/src/com/mapswithme/maps/search/SearchFilterController.java b/android/src/com/mapswithme/maps/search/SearchFilterController.java
index 2550d4507e..768d3fc919 100644
--- a/android/src/com/mapswithme/maps/search/SearchFilterController.java
+++ b/android/src/com/mapswithme/maps/search/SearchFilterController.java
@@ -185,6 +185,12 @@ public class SearchFilterController
     }
   }
 
+  public void resetFilter()
+  {
+    setFilter(null);
+    updateFilterButtonVisibility(false);
+  }
+
   @Nullable
   public BookingFilterParams getBookingFilterParams()
   {
diff --git a/android/src/com/mapswithme/maps/search/SearchFragment.java b/android/src/com/mapswithme/maps/search/SearchFragment.java
index 1107cb2b8e..fa15791701 100644
--- a/android/src/com/mapswithme/maps/search/SearchFragment.java
+++ b/android/src/com/mapswithme/maps/search/SearchFragment.java
@@ -191,10 +191,7 @@ public class SearchFragment extends BaseMwmFragment
     {
       super.clear();
       if (mFilterController != null)
-      {
-        mFilterController.setFilter(null);
-        mFilterController.updateFilterButtonVisibility(false);
-      }
+        mFilterController.resetFilter();
     }
   }
 
@@ -552,6 +549,9 @@ public class SearchFragment extends BaseMwmFragment
       RoutingController.get().onPoiSelected(point);
     }
 
+    if (mFilterController != null)
+      mFilterController.resetFilter();
+
     mToolbarController.deactivate();
 
     if (getActivity() instanceof SearchActivity)