diff --git a/drape_frontend/navigator.cpp b/drape_frontend/navigator.cpp
index 502d1fa705..c0d259cd15 100644
--- a/drape_frontend/navigator.cpp
+++ b/drape_frontend/navigator.cpp
@@ -53,14 +53,15 @@ void Navigator::SetFromRect(m2::AnyRectD const & r)
 {
   m2::RectD const & worldR = df::GetWorldRect();
 
-  m_Screen.SetFromRect(r);
-  m_Screen = ScaleInto(m_Screen, worldR);
+  ScreenBase tmp = m_Screen;
+
+  tmp.SetFromRect(r);
+  tmp = ScaleInto(tmp, worldR);
+  if (CheckMaxScale(tmp))
+    m_Screen = tmp;
 
   if (!m_InAction)
-  {
-    m_StartScreen.SetFromRect(r);
-    m_StartScreen = ScaleInto(m_StartScreen, worldR);
-  }
+    m_StartScreen = tmp;
 }
 
 void Navigator::CenterViewport(m2::PointD const & p)