diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 372d7f4d53e62edfebba105e3c2e09a5364f1555..b0a10636cfdbb9c0f1150979c8f9d791d67c29f1 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -369,7 +369,7 @@ FlightMap {
                 clickMenu.coord = clickCoord
                 clickMenu.popup()
             } else if (guidedActionsController.showGotoLocation) {
-                _guidedLocationCoordinate = clickCoord
+                gotoLocationItem.show(clickCoord)
                 guidedActionsController.confirmAction(guidedActionsController.actionGoto, clickCoord)
             } else if (guidedActionsController.showOrbit) {
                 orbitMapCircle.show(clickCoord)
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index ac0d2adc246f41c1f2e8e935cb25e237879d3b47..087661ea48028446f8e8c3a377e5d5a802e4b8cf 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -572,15 +572,15 @@ QGCView {
 
                 onClicked: {
                     switch (index) {
-                    case 0:
+                    case 1:
                         _addWaypointOnClick = checked
                         _addROIOnClick = false
                         break
-                    case 1:
+                    case 2:
                         _addROIOnClick = checked
                         _addWaypointOnClick = false
                         break
-                    case 2:
+                    case 3:
                         if (_singleComplexItem) {
                             addComplexItem(_missionController.complexMissionItemNames[0])
                         }
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 9dce5244b5778d62c96232cbb8b2c6dc40799fd8..b4795e65e2c4f923f66dd9058d0a3f27da106cf9 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -2780,15 +2780,6 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
         return;
     }
 
-    double lat, lon, alt;
-    if (centerCoord.isValid()) {
-        lat = lon = alt = qQNaN();
-    } else {
-        lat = centerCoord.latitude();
-        lon = centerCoord.longitude();
-        alt = amslAltitude;
-    }
-
     if (capabilityBits() && MAV_PROTOCOL_CAPABILITY_COMMAND_INT) {
         sendMavCommandInt(defaultComponentId(),
                           MAV_CMD_DO_ORBIT,
@@ -2798,7 +2789,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
                           qQNaN(),         // Use default velocity
                           0,               // Vehicle points to center
                           qQNaN(),         // reserved
-                          lat, lon, alt);
+                          centerCoord.latitude(), centerCoord.longitude(), amslAltitude);
     } else {
         sendMavCommand(defaultComponentId(),
                        MAV_CMD_DO_ORBIT,
@@ -2807,7 +2798,7 @@ void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius,
                        qQNaN(),         // Use default velocity
                        0,               // Vehicle points to center
                        qQNaN(),         // reserved
-                       lat, lon, alt);
+                       centerCoord.latitude(), centerCoord.longitude(), amslAltitude);
     }
 }