diff --git a/src/MissionEditor/PlanToolBar.qml b/src/MissionEditor/PlanToolBar.qml
index 7a6fa5abefc5513c7ac6e24543d099384d182a45..3105d80c407ce3651d8bf9714e30227c7fd672da 100644
--- a/src/MissionEditor/PlanToolBar.qml
+++ b/src/MissionEditor/PlanToolBar.qml
@@ -17,7 +17,7 @@ Rectangle {
     anchors.right:      parent.right
     anchors.top:        parent.top
     z:                  toolBar.z + 1
-    color:              qgcPal.window
+    color:              qgcPal.globalTheme === QGCPalette.Light ? Qt.rgba(1,1,1,0.8) : Qt.rgba(0,0,0,0.75)
     visible:            false
 
     signal showFlyView
@@ -56,6 +56,14 @@ Rectangle {
 
     QGCPalette { id: qgcPal }
 
+    //-- Eat mouse events, preventing them from reaching toolbar, which is underneath us.
+    MouseArea {
+        anchors.fill:   parent
+        onWheel:        { wheel.accepted = true; }
+        onPressed:      { mouse.accepted = true; }
+        onReleased:     { mouse.accepted = true; }
+    }
+
     Row {
         anchors.top:    parent.top
         anchors.bottom: parent.bottom
diff --git a/src/ui/MainWindowInner.qml b/src/ui/MainWindowInner.qml
index 73c132ba3c330576fbac5b7c5ab0eb9f43fa5816..93e051f63269bc3800fd44a260e9198828065b35 100644
--- a/src/ui/MainWindowInner.qml
+++ b/src/ui/MainWindowInner.qml
@@ -259,6 +259,7 @@ Item {
         anchors.left:       parent.left
         anchors.right:      parent.right
         anchors.top:        parent.top
+        opacity:            planToolBar.visible ? 0 : 1
         z:                  QGroundControl.zOrderTopMost
 
         Component.onCompleted:  ScreenTools.availableHeight = parent.height - toolBar.height