diff --git a/src/QmlControls/ToolStrip.qml b/src/QmlControls/ToolStrip.qml
index 9152a7f24d92c6639a08d1af99f8cf90422ab559..7acc118f28a4eac41c100da64388d7bfcf590e60 100644
--- a/src/QmlControls/ToolStrip.qml
+++ b/src/QmlControls/ToolStrip.qml
@@ -39,7 +39,7 @@ Rectangle {
     // whether to show or hide the optional elements on the fly.
 
     property bool _showOptionalElements:    true
-    property bool _needRecalc:              true
+    property bool _needRecalc:              false
 
     Component.onCompleted: recalcShowOptionalElements()
 
@@ -54,7 +54,6 @@ Rectangle {
         onDefaultFontPixelHeightChanged:    recalcShowOptionalElements()
     }
 
-    /*
     onHeightChanged: {
         if (_needRecalc) {
             _needRecalc = false
@@ -63,18 +62,13 @@ Rectangle {
             }
         }
     }
-    */
 
     function recalcShowOptionalElements() {
-        if (_showOptionalElements) {
-            if (maxHeight && height > maxHeight) {
-                _showOptionalElements = false
-            }
-        } else {
+        if (maxHeight > 0) {
+            _needRecalc = false
+            _showOptionalElements =  height <= maxHeight
             _needRecalc = true
-            _showOptionalElements = true
         }
-
     }
 
     QGCPalette { id: qgcPal }