diff --git a/src/ui/MainWindow.cc b/src/ui/MainWindow.cc
index c94144143d609db673da035eee9975d3c4894814..1b4c64e92314d49d2b7433da8d33a0f3bd6c6a0d 100644
--- a/src/ui/MainWindow.cc
+++ b/src/ui/MainWindow.cc
@@ -325,10 +325,10 @@ void MainWindow::buildCommonWidgets()
 
     if (!waypointsDockWidget)
     {
-        waypointsDockWidget = new QDockWidget(tr("Waypoint List"), this);
+        waypointsDockWidget = new QDockWidget(tr("Mission Plan"), this);
         waypointsDockWidget->setWidget( new QGCWaypointListMulti(this) );
         waypointsDockWidget->setObjectName("WAYPOINT_LIST_DOCKWIDGET");
-        addToToolsMenu (waypointsDockWidget, tr("Waypoints List"), SLOT(showToolWidget(bool)), MENU_WAYPOINTS, Qt::BottomDockWidgetArea);
+        addToToolsMenu (waypointsDockWidget, tr("Mission Plan"), SLOT(showToolWidget(bool)), MENU_WAYPOINTS, Qt::BottomDockWidgetArea);
     }
 
     if (!infoDockWidget)
diff --git a/src/ui/WaypointView.cc b/src/ui/WaypointView.cc
index d30c6dd56893177ddf68ea98f64965aa6af9aa95..cfd5ff60bac01effadd25963d432eb566af70ed9 100644
--- a/src/ui/WaypointView.cc
+++ b/src/ui/WaypointView.cc
@@ -251,6 +251,8 @@ void WaypointView::changedAction(int index)
     case MAV_ACTION_RELAY_OFF:
         // Back to global frame
         if (wp->getFrame() == MAV_FRAME_MISSION) changedFrame(0);
+        // Update view
+        updateActionView(actionIndex);
         break;
     case MAV_ACTION_NB:
     default: