diff --git a/geometry/any_rect2d.hpp b/geometry/any_rect2d.hpp
index 30d8448158..b538f5f99e 100644
--- a/geometry/any_rect2d.hpp
+++ b/geometry/any_rect2d.hpp
@@ -100,6 +100,23 @@ namespace m2
 
     T GetMaxSize() const { return max(m_rect.SizeX(), m_rect.SizeY()); }
 
+    bool EqualDxDy(AnyRect<T> const & r, T eps) const
+    {
+      m2::Point<T> arr1[4];
+      GetGlobalPoints(arr1);
+      sort(arr1, arr1 + 4);
+
+      m2::Point<T> arr2[4];
+      r.GetGlobalPoints(arr2);
+      sort(arr2, arr2 + 4);
+
+      for (size_t i = 0; i < 4; ++i)
+        if (!arr1[i].EqualDxDy(arr2[i], eps))
+          return false;
+
+      return true;
+    }
+
     bool IsPointInside(Point<T> const & pt) const
     {
       return m_rect.IsPointInside(ConvertTo(pt));
diff --git a/map/framework.cpp b/map/framework.cpp
index 54e9414ec1..7aa5d6a9fd 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1004,9 +1004,6 @@ void Framework::UpdateUserViewportChanged()
   {
     (void)GetCurrentPosition(m_lastInteractiveSearchParams.m_lat,
                              m_lastInteractiveSearchParams.m_lon);
-    m_lastInteractiveSearchParams.SetSearchMode(search::SearchParams::IN_VIEWPORT_ONLY);
-    m_lastInteractiveSearchParams.SetForceSearch(false);
-
     Search(m_lastInteractiveSearchParams);
   }
 }
@@ -1437,7 +1434,8 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
   m_drapeEngine = make_unique_dp<df::DrapeEngine>(move(p));
   AddViewportListener([this](ScreenBase const & screen)
   {
-    UpdateUserViewportChanged();
+    if (!screen.GlobalRect().EqualDxDy(m_currentModelView.GlobalRect(), 1.0E-4))
+      UpdateUserViewportChanged();
     m_currentModelView = screen;
   });
   m_drapeEngine->SetTapEventInfoListener(bind(&Framework::OnTapEvent, this, _1, _2, _3, _4));