diff --git a/ground/gcs/src/plugins/opmap/opmapgadget.cpp b/ground/gcs/src/plugins/opmap/opmapgadget.cpp
index 2d81b99e7..3667bff08 100644
--- a/ground/gcs/src/plugins/opmap/opmapgadget.cpp
+++ b/ground/gcs/src/plugins/opmap/opmapgadget.cpp
@@ -59,6 +59,7 @@ void OPMapGadget::loadConfiguration(IUAVGadgetConfiguration *config)
 {
     m_config = qobject_cast<OPMapGadgetConfiguration *>(config);
     m_widget->setMapProvider(m_config->mapProvider());
+    m_widget->setMaxUpdateRate(m_config->maxUpdateRate());
     m_widget->setUseOpenGL(m_config->useOpenGL());
     m_widget->setShowTileGridLines(m_config->showTileGridLines());
     m_widget->setAccessMode(m_config->accessMode());
diff --git a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
index ccf4f2376..1d71e012e 100644
--- a/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
+++ b/ground/gcs/src/plugins/opmap/opmapgadgetwidget.cpp
@@ -1100,6 +1100,15 @@ void OPMapGadgetWidget::setMaxUpdateRate(int update_rate)
         m_updateTimer->setInterval(m_maxUpdateRate);
     }
 
+    // Update context menu selection
+    int max_rate_list_size = sizeof(max_update_rate_list) / sizeof(max_update_rate_list[0]);
+    for (int i = 0; i < max_rate_list_size; i++) {
+        int maxUpdateRate = max_update_rate_list[i];
+        if (maxUpdateRate == update_rate) {
+            maxUpdateRateAct.at(i)->setChecked(true);
+        }
+    }
+
 // if (m_statusUpdateTimer)
 // m_statusUpdateTimer->setInterval(m_maxUpdateRate);
 }
@@ -1112,6 +1121,15 @@ void OPMapGadgetWidget::setSafeAreaRadius(int safe_area_radius)
 
     m_map->Home->SetSafeArea(safe_area_radius);
     m_map->Home->SetToggleRefresh(true);
+
+    // Update context menu selection
+    int safe_area_list_size = sizeof(safe_area_radius_list) / sizeof(safe_area_radius_list[0]);
+    for (int i = 0; i < safe_area_list_size; i++) {
+        int safeArea = safe_area_radius_list[i];
+        if (safeArea == safe_area_radius) {
+            safeAreaAct.at(i)->setChecked(true);
+        }
+    }
 }
 
 void OPMapGadgetWidget::setShowSafeArea(bool showSafeArea)
@@ -1122,6 +1140,8 @@ void OPMapGadgetWidget::setShowSafeArea(bool showSafeArea)
 
     m_map->Home->SetShowSafeArea(showSafeArea);
     m_map->Home->SetToggleRefresh(true);
+
+    showSafeAreaAct->setChecked(showSafeArea);
 }
 
 void OPMapGadgetWidget::setZoom(int zoom)