diff --git a/src/QmlControls/QGCButton.qml b/src/QmlControls/QGCButton.qml
index 89a550f7f255dbc621469d42931a3c2f791e75bb..ee57ffd02d4004b3f1874c99ffb8e0ae79655d4e 100644
--- a/src/QmlControls/QGCButton.qml
+++ b/src/QmlControls/QGCButton.qml
@@ -9,10 +9,10 @@ import QGroundControl.MousePosition 1.0
 Button {
     // primary: true - this is the primary button for this group of buttons
     property bool primary: false
-    property bool showHighlight: (pressed | hovered | checked) && !__forceHoverOff
 
     property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
 
+    property bool __showHighLight: (pressed | hovered | checked) && !__forceHoverOff
 
     // This fixes the issue with button hover where if a Button is near the edge oa QQuickWidget you can
     // move the mouse fast enough such that the MouseArea does not trigger an onExited. This is turn
@@ -70,7 +70,7 @@ Button {
 
                 Rectangle {
                     anchors.fill: parent
-                    color: showHighlight ?
+                    color: __showHighLight ?
                         control.__qgcPal.buttonHighlight :
                         (primary ? control.__qgcPal.primaryButton : control.__qgcPal.button)
                 }
@@ -107,7 +107,7 @@ Button {
                         renderType: Text.NativeRendering
                         anchors.verticalCenter: parent.verticalCenter
                         text: control.text
-                        color: showHighlight ?
+                        color: __showHighLight ?
                             control.__qgcPal.buttonHighlightText :
                             (primary ? control.__qgcPal.primaryButtonText : control.__qgcPal.buttonText)
                     }
diff --git a/src/QmlControls/QGCToolBarButton.qml b/src/QmlControls/QGCToolBarButton.qml
index fef030222acedef5b098ee54fddb667fe926dd68..8d228a13dc52d79aa24e719c7363f2c7c2fca21f 100644
--- a/src/QmlControls/QGCToolBarButton.qml
+++ b/src/QmlControls/QGCToolBarButton.qml
@@ -10,6 +10,7 @@ QGCButton {
     id: button
     property bool repaintChevron: false
     property var  __qgcPal: QGCPalette { colorGroupEnabled: enabled }
+    property bool showHighlight: __showHighLight
     style: ButtonStyle {
         background: Item {
             anchors.margins: 3