diff --git a/drape_frontend/user_event_stream.cpp b/drape_frontend/user_event_stream.cpp
index a458b974c5..5e8c410cb5 100644
--- a/drape_frontend/user_event_stream.cpp
+++ b/drape_frontend/user_event_stream.cpp
@@ -491,10 +491,11 @@ bool UserEventStream::SetRect(m2::AnyRectD const & rect, bool isAnim, bool fitIn
   ScreenBase tmp = GetCurrentScreen();
   if (fitInViewport)
   {
-    auto const useVisViewport = useVisibleViewport && m_visibleViewport.IsValid();
-    tmp.SetFromRects(rect, useVisViewport ? m_visibleViewport : tmp.PixelRectIn3d());
-    tmp.MatchGandP3d(rect.GlobalCenter(), useVisViewport ? m_visibleViewport.Center()
-                                                         : tmp.PixelRectIn3d().Center());
+    auto viewportRect = tmp.PixelRectIn3d();
+    if (useVisibleViewport && m_visibleViewport.IsValid())
+      viewportRect = m_visibleViewport;
+    tmp.SetFromRects(rect, viewportRect);
+    tmp.MatchGandP3d(rect.GlobalCenter(), viewportRect.Center());
   }
   else
   {
diff --git a/map/framework.cpp b/map/framework.cpp
index 1b4a1092a2..49adcb7db5 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1253,10 +1253,10 @@ void Framework::ShowRect(m2::RectD const & rect, int maxScale, bool animation, b
                                   useVisibleViewport);
 }
 
-void Framework::ShowRect(m2::AnyRectD const & rect, bool useVisibleViewport)
+void Framework::ShowRect(m2::AnyRectD const & rect, bool animation, bool useVisibleViewport)
 {
   if (m_drapeEngine != nullptr)
-    m_drapeEngine->SetModelViewAnyRect(rect, true /* isAnim */, useVisibleViewport);
+    m_drapeEngine->SetModelViewAnyRect(rect, animation, useVisibleViewport);
 }
 
 void Framework::GetTouchRect(m2::PointD const & center, uint32_t pxRadius, m2::AnyRectD & rect)
diff --git a/map/framework.hpp b/map/framework.hpp
index 9ba4a7bfbc..78f3b3809d 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -634,7 +634,7 @@ public:
   /// - Check minimal visible scale according to downloaded countries.
   void ShowRect(m2::RectD const & rect, int maxScale = -1, bool animation = true,
                 bool useVisibleViewport = false);
-  void ShowRect(m2::AnyRectD const & rect, bool useVisibleViewport = false);
+  void ShowRect(m2::AnyRectD const & rect, bool animation = true, bool useVisibleViewport = false);
 
   void GetTouchRect(m2::PointD const & center, uint32_t pxRadius, m2::AnyRectD & rect);