diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 0a72adb6798d6be505cc22166217e3e96f1eff37..b410685cf07b5ce64cabd85a0fafd1b224657cfa 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -540,6 +540,7 @@ QGCView {
             id:                 guidedActionsController
             missionController:  _missionController
             confirmDialog:      guidedActionConfirm
+            actionList:         guidedActionList
             altitudeSlider:     _altitudeSlider
             z:                  _flightVideoPipControl.z + 1
 
diff --git a/src/FlightDisplay/FlightDisplayViewMap.qml b/src/FlightDisplay/FlightDisplayViewMap.qml
index 3e38ee151f56202779f93afea5c40ea0819ec0dd..c8c844f667b486f72db9117e5e964f783986ec47 100644
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -240,8 +240,9 @@ FlightMap {
         anchorPoint.y:  sourceItem.anchorPointY
 
         sourceItem: MissionItemIndexLabel {
-            checked: true
-            label:   qsTr("G", "Goto here waypoint") // second string is translator's hint.
+            checked:    true
+            index:      -1
+            label:      qsTr("Goto here", "Goto here waypoint")
         }
     }    
 
@@ -260,7 +261,7 @@ FlightMap {
         anchors.fill: parent
 
         onClicked: {
-            if (guidedActionsController.showGotoLocation) {
+            if (guidedActionsController.showGotoLocation && !guidedActionsController.guidedUIVisible) {
                 _gotoHereCoordinate = flightMap.toCoordinate(Qt.point(mouse.x, mouse.y), false /* clipToViewPort */)
                 guidedActionsController.confirmAction(guidedActionsController.actionGoto, _gotoHereCoordinate)
             }
diff --git a/src/FlightDisplay/GuidedActionConfirm.qml b/src/FlightDisplay/GuidedActionConfirm.qml
index 562298a6d95d933a111b5b5f480bac4978f924c0..48c159fa2e9cf0804683f9a2d7b7a77e176f6ece 100644
--- a/src/FlightDisplay/GuidedActionConfirm.qml
+++ b/src/FlightDisplay/GuidedActionConfirm.qml
@@ -16,7 +16,7 @@ import QGroundControl.Controls      1.0
 import QGroundControl.Palette       1.0
 
 /// Guided actions confirmation dialog
-Rectangle {
+NoMouseThroughRectangle {
     id:             _root
     border.color:   qgcPal.alertBorder
     border.width:   1
diff --git a/src/FlightDisplay/GuidedActionList.qml b/src/FlightDisplay/GuidedActionList.qml
index 6ff749c8faf0dcfc085a33a865204ac7c9d35ffb..4c002c3ce1137a02353932f17ae89dd20bd53948 100644
--- a/src/FlightDisplay/GuidedActionList.qml
+++ b/src/FlightDisplay/GuidedActionList.qml
@@ -17,7 +17,7 @@ import QGroundControl.Controls      1.0
 import QGroundControl.Palette       1.0
 
 /// Dialog showing list of available guided actions
-Rectangle {
+NoMouseThroughRectangle {
     id:         _root
     width:      actionColumn.width  + (_margins * 4)
     height:     actionColumn.height + (_margins * 4)
diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml
index 05b9c9d1a8787d7f4d5a470d841eee4f537d1a53..c344287e27ad37359650925a32b470c7b9131d8f 100644
--- a/src/FlightDisplay/GuidedActionsController.qml
+++ b/src/FlightDisplay/GuidedActionsController.qml
@@ -29,6 +29,7 @@ Item {
 
     property var missionController
     property var confirmDialog
+    property var actionList
     property var altitudeSlider
 
     readonly property string emergencyStopTitle:    qsTr("Emergency Stop")
@@ -96,6 +97,8 @@ Item {
     property bool showLandAbort:        _activeVehicle && _vehicleFlying && _activeVehicle.fixedWing && _vehicleLanding
     property bool showGotoLocation:     _activeVehicle && _activeVehicle.guidedMode && _vehicleFlying
 
+    property bool guidedUIVisible:      guidedActionConfirm.visible || guidedActionList.visible
+
     property var    _activeVehicle:         QGroundControl.multiVehicleManager.activeVehicle
     property string _flightMode:            _activeVehicle ? _activeVehicle.flightMode : ""
     property bool   _missionAvailable:      missionController.containsItems