diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml
index 6e9f7304258ca3d3725d6bdd03a6e1fd1a041edc..d76c503b49504e54c3bfbaa758b3987be2fdf1fa 100644
--- a/src/FlightDisplay/FlightDisplayView.qml
+++ b/src/FlightDisplay/FlightDisplayView.qml
@@ -343,7 +343,7 @@ QGCView {
         }
 
         ToolStrip {
-            visible:            _activeVehicle ? _activeVehicle.guidedModeSupported : false
+            visible:            _activeVehicle ? _activeVehicle.guidedModeSupported : true
             id:                 toolStrip
             anchors.leftMargin: ScreenTools.defaultFontPixelWidth
             anchors.left:       _panel.left
diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index 7acc118f28a4eac41c100da64388d7bfcf590e60..1e674ba79c7817f532c9945228727fec8ca6c9e5 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -41,11 +41,8 @@ Rectangle {
     property bool _showOptionalElements:    true
     property bool _needRecalc:              false
 
-    Component.onCompleted: recalcShowOptionalElements()
-
+    Component.onCompleted:  recalcShowOptionalElements()
     onMaxHeightChanged:     recalcShowOptionalElements()
-    onModelChanged:         recalcShowOptionalElements()
-    onButtonVisibleChanged: recalcShowOptionalElements()
 
     Connections {
         target: ScreenTools