diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 14926396f6d81293f1ea98de404e1bc896bad658..a806899682ef688904d40fd76865836326b02847 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -126,11 +126,13 @@ FlightMap {
 
         onClicked: {
             if (_activeVehicle) {
-                if (_activeVehicle.guidedMode && flightWidgets.guidedModeBar.state == "Shown") {
-                    _gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y))
-                    flightWidgets.guidedModeBar.confirmAction(flightWidgets.guidedModeBar.confirmGoTo)
-                } else {
+                if (flightWidgets.guidedModeBar.state != "Shown") {
                     flightWidgets.guidedModeBar.state = "Shown"
+                } else {
+                    if (flightWidgets.gotoEnabled) {
+                        _gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y))
+                        flightWidgets.guidedModeBar.confirmAction(flightWidgets.guidedModeBar.confirmGoTo)
+                    }
                 }
             }
         }
diff --git a/src/FlightDisplay/FlightDisplayViewWidgets.qml b/src/FlightDisplay/FlightDisplayViewWidgets.qml
index 66923a98d221ca30b250043a417126325dbeb054..cfea5e63e2dc2590ad5b30b2cd19e09560d1d16c 100644
--- a/src/FlightDisplay/FlightDisplayViewWidgets.qml
+++ b/src/FlightDisplay/FlightDisplayViewWidgets.qml
@@ -25,7 +25,8 @@ import QGroundControl.FlightMap     1.0
 Item {
     id: _root
 
-    property alias guidedModeBar: _guidedModeBar
+    property alias  guidedModeBar:  _guidedModeBar
+    property bool   gotoEnabled:    _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
 
     property var    _activeVehicle:             QGroundControl.multiVehicleManager.activeVehicle
     property bool   _isSatellite:               _mainIsMap ? (_flightMap ? _flightMap.isSatelliteMap : true) : true
@@ -444,7 +445,7 @@ Item {
                 anchors.horizontalCenter: parent.horizontalCenter
                 color:      _lightWidgetBorders ? qgcPal.mapWidgetBorderDark : qgcPal.mapWidgetBorderLight
                 text:       "Click in map to move vehicle"
-                visible:    _activeVehicle && _activeVehicle.guidedMode && _activeVehicle.flying
+                visible:    gotoEnabled
             }
 
             Row {