diff --git a/src/FlightDisplay/FlyViewAdditionalActionsList.qml b/src/FlightDisplay/FlyViewAdditionalActionsList.qml
index cc6269b53245..c10d3edca353 100644
--- a/src/FlightDisplay/FlyViewAdditionalActionsList.qml
+++ b/src/FlightDisplay/FlyViewAdditionalActionsList.qml
@@ -12,8 +12,15 @@ import QtQml
 QtObject {
     property var guidedController
 
-    property bool anyActionAvailable: guidedController.showStartMission || guidedController.showContinueMission || guidedController.showChangeAlt || 
-                                      guidedController.showChangeLoiterRadius ||  guidedController.showLandAbort || guidedController.showChangeSpeed
+    property bool anyActionAvailable: {
+        for (var i = 0; i < model.length; i++) {
+            if (model[i].visible)
+                return true
+        }
+
+        return false
+    }
+
     property var model: [
         {
             title:      guidedController.startMissionTitle,
diff --git a/src/FlightDisplay/FlyViewAdditionalCustomActionsList.qml b/src/FlightDisplay/FlyViewAdditionalCustomActionsList.qml
index 510231b5e132..648a86c94df0 100644
--- a/src/FlightDisplay/FlyViewAdditionalCustomActionsList.qml
+++ b/src/FlightDisplay/FlyViewAdditionalCustomActionsList.qml
@@ -15,6 +15,14 @@ Item {
 
     property var guidedController
 
-    property bool anyActionAvailable: false
+    property bool anyActionAvailable: {
+        for (var i = 0; i < model.length; i++) {
+            if (model[i].visible)
+                return true
+        }
+
+        return false
+    }
+
     property var model: [ ]
 }