diff --git a/src/ui/map/QGCMapToolBar.cc b/src/ui/map/QGCMapToolBar.cc
index 88237e0da8957baeff3499b1322ba570e9a11e15..7627eab775048198d2f21ca0327c94f056077163 100644
--- a/src/ui/map/QGCMapToolBar.cc
+++ b/src/ui/map/QGCMapToolBar.cc
@@ -152,7 +152,7 @@ void QGCMapToolBar::setUAVTrailDistance()
         if (ok)
         {
             map->setTrailModeDistance(trailDistance);
-            ui->posLabel->setText(tr("Trail mode: Every %1 meter%2").arg(trailDistance).arg((trailDistance > 1) ? "s" : ""));
+            ui->posLabel->setText(tr("Trail mode: Every %1 meter%2").arg(trailDistance).arg((trailDistance == 1) ? "s" : ""));
         }
     }
 }
@@ -166,7 +166,11 @@ void QGCMapToolBar::setUpdateInterval()
     {
         bool ok;
         float time = action->data().toFloat(&ok);
-        if (ok) map->setUpdateRateLimit(time);
+        if (ok)
+        {
+            map->setUpdateRateLimit(time);
+            ui->posLabel->setText(tr("Map update rate limit: %1 second%2").arg(time).arg((time != 1.0f) ? "s" : ""));
+        }
     }
 }
 
diff --git a/src/ui/map/QGCMapWidget.cc b/src/ui/map/QGCMapWidget.cc
index 55debdc14d9145bc8dd375a0cf4c94366f26df32..3b3c62c371bfc15d7b8977f990208d3305ebf37d 100644
--- a/src/ui/map/QGCMapWidget.cc
+++ b/src/ui/map/QGCMapWidget.cc
@@ -17,7 +17,7 @@ QGCMapWidget::QGCMapWidget(QWidget *parent) :
     followUAVID(0)
 {
     // Widget is inactive until shown
-
+    loadSettings(false);
     // Set cache mode
 }
 
diff --git a/src/ui/map/QGCMapWidget.h b/src/ui/map/QGCMapWidget.h
index caea793186d757c6b8ac104008dc9e000f72ebab..be22ae275eba3ae497bcde1f90c9f61e15bc0bb7 100644
--- a/src/ui/map/QGCMapWidget.h
+++ b/src/ui/map/QGCMapWidget.h
@@ -100,7 +100,7 @@ public slots:
     }
 
     /** @brief Load the settings for this widget from disk */
-    void loadSettings(bool changePosition=false);
+    void loadSettings(bool changePosition=true);
     /** @brief Store the settings for this widget to disk */
     void storeSettings();