diff --git a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
index 93ebc493b09e759bddd84958963010457e5ab4c3..71696461f07650cb27df7fac96fce9fa605369e4 100644
--- a/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
+++ b/src/FlightMap/Widgets/QGCInstrumentWidgetAlternate.qml
@@ -17,7 +17,6 @@ import QGroundControl.FactSystem    1.0
 import QGroundControl.FlightMap     1.0
 import QGroundControl.Palette       1.0
 
-/// Instrument panel shown when virtual thumbsticks are visible
 Rectangle {
     id:             root
     width:          getPreferredInstrumentWidth()
@@ -40,6 +39,11 @@ Rectangle {
     property real   _availableValueHeight: maxHeight - (root.height + _valuesItem.anchors.topMargin)
     property var    _activeVehicle:     QGroundControl.multiVehicleManager.activeVehicle
 
+    // Prevent all clicks from going through to lower layers
+    DeadMouseArea {
+        anchors.fill: parent
+    }
+
     QGCPalette { id: qgcPal }
 
     QGCAttitudeWidget {
@@ -68,6 +72,11 @@ Rectangle {
         height:             _valuesWidget.height
         visible:            widgetRoot.showValues
 
+        // Prevent all clicks from going through to lower layers
+        DeadMouseArea {
+            anchors.fill: parent
+        }
+
         Rectangle {
             anchors.fill:   _valuesWidget
             color:          qgcPal.window
diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index 7d737e0f66cc4c1919f597d291649920a9b8b02a..442456999b0dff3d520c63a3362310c48d764b63 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -62,6 +62,11 @@ Rectangle {
         flyButton.checked = true
     }
 
+    // Prevent all clicks from going through to lower layers
+    DeadMouseArea {
+        anchors.fill: parent
+    }
+
     /// Bottom single pixel divider
     Rectangle {
         anchors.left:   parent.left