diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 1ab00c9cce..5ad02b8d28 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -58,8 +58,10 @@ namespace qt
       m_pScale(0)
   {
     m_framework->InitStorage(storage);
+
     m_timer = new QTimer(this);
     m_handle->setUpdatesEnabled(false);
+
 #ifdef OMIM_OS_MAC
     m_videoTimer.reset(CreateAppleVideoTimer(bind(&DrawWidget::DrawFrame, this)));
 #else
@@ -89,6 +91,11 @@ namespace qt
     m_framework->Invalidate();
   }
 
+  void DrawWidget::UpdateAfterSettingsChanged()
+  {
+    m_framework->SetupMeasurementSystem();
+  }
+
   bool DrawWidget::LoadState()
   {
     pair<int, int> widthAndHeight;
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp
index b77c3d792a..4ee5a13378 100644
--- a/qt/draw_widget.hpp
+++ b/qt/draw_widget.hpp
@@ -104,6 +104,7 @@ namespace qt
     bool LoadState();
 
     void UpdateNow();
+    void UpdateAfterSettingsChanged();
 
     void PrepareShutdown();
 
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index 9ba8969910..5fbebd77cf 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -119,6 +119,8 @@ MainWindow::MainWindow()
       ShowUpdateDialog();
   }
 #endif // NO_DOWNLOADER
+
+  m_pDrawWidget->UpdateAfterSettingsChanged();
 }
 
 #if defined(Q_WS_WIN)
@@ -358,6 +360,8 @@ void MainWindow::OnPreferences()
 {
   PreferencesDialog dlg(this);
   dlg.exec();
+
+  m_pDrawWidget->UpdateAfterSettingsChanged();
 }
 
 #ifndef NO_DOWNLOADER