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 {
diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index 2a2f4ff407fbc09163b0b00dd4180d6370a036a0..408023f57c2ac8482554cc3b5b0f6f04a5eb8211 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -521,7 +521,7 @@ void Vehicle::_handleExtendedSysState(mavlink_message_t& message)
     mavlink_msg_extended_sys_state_decode(&message, &extendedState);
 
     switch (extendedState.landed_state) {
-        case MAV_LANDED_STATE_UNDEFINED:
+    case MAV_LANDED_STATE_UNDEFINED:
         break;
     case MAV_LANDED_STATE_ON_GROUND:
         setFlying(false);
diff --git a/src/ui/toolbar/MainToolBarIndicators.qml b/src/ui/toolbar/MainToolBarIndicators.qml
index 7c209998f53555972c8667efb6a13c20d0ee66b8..fff05d7879c9e5959fe72741a243d8195acd9e6b 100644
--- a/src/ui/toolbar/MainToolBarIndicators.qml
+++ b/src/ui/toolbar/MainToolBarIndicators.qml
@@ -139,12 +139,14 @@ Row {
             anchors.left:           gpsIcon.right
 
             QGCLabel {
+                anchors.horizontalCenter: hdopValue.horizontalCenter
                 visible:    activeVehicle && !isNaN(activeVehicle.gps.hdop.value)
                 color:      qgcPal.buttonText
                 text:       activeVehicle ? activeVehicle.gps.count.valueString : ""
             }
 
             QGCLabel {
+                id:         hdopValue
                 visible:    activeVehicle && !isNaN(activeVehicle.gps.hdop.value)
                 color:      qgcPal.buttonText
                 text:       activeVehicle ? activeVehicle.gps.hdop.value.toFixed(1) : ""