diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponent.h b/src/AutoPilotPlugins/APM/APMSafetyComponent.h
index 8507424d4f8a449576a9b724e3a7ddbfab21e513..f63e70e9e6cfa58dee0d8a53a3612931ee2eac7d 100644
--- a/src/AutoPilotPlugins/APM/APMSafetyComponent.h
+++ b/src/AutoPilotPlugins/APM/APMSafetyComponent.h
@@ -24,14 +24,15 @@ public:
     QStringList setupCompleteChangedTriggerList(void) const override;
     
     // Virtuals from VehicleComponent
-    QString name(void) const override;
-    QString description(void) const override;
-    QString iconResource(void) const override;
-    bool requiresSetup(void) const override;
-    bool setupComplete(void) const override;
-    QUrl setupSource(void) const override;
-    QUrl summaryQmlSource(void) const override;
-    bool allowSetupWhileArmed(void) const override { return true; }
+    QString name                (void) const override;
+    QString description         (void) const override;
+    QString iconResource        (void) const override;
+    bool requiresSetup          (void) const override;
+    bool setupComplete          (void) const override;
+    QUrl setupSource            (void) const override;
+    QUrl summaryQmlSource       (void) const override;
+    bool allowSetupWhileArmed   (void) const override { return true; }
+    bool allowSetupWhileFlying  (void) const override { return true; }
 
 private:
     const QString   _name;
diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.h b/src/AutoPilotPlugins/PX4/SafetyComponent.h
index bb1a4a78432c3f8e339d599335d2955cb1338be3..32bd47bedc53abe084d18cfc5a96dcccf8aa2199 100644
--- a/src/AutoPilotPlugins/PX4/SafetyComponent.h
+++ b/src/AutoPilotPlugins/PX4/SafetyComponent.h
@@ -29,14 +29,15 @@ public:
     QStringList setupCompleteChangedTriggerList(void) const override;
     
     // Virtuals from VehicleComponent
-    QString name(void) const override;
-    QString description(void) const override;
-    QString iconResource(void) const override;
-    bool requiresSetup(void) const override;
-    bool setupComplete(void) const override;
-    QUrl setupSource(void) const override;
-    QUrl summaryQmlSource(void) const override;
-    bool allowSetupWhileArmed(void) const override { return true; }
+    QString name                (void) const override;
+    QString description         (void) const override;
+    QString iconResource        (void) const override;
+    bool requiresSetup          (void) const override;
+    bool setupComplete          (void) const override;
+    QUrl setupSource            (void) const override;
+    QUrl summaryQmlSource       (void) const override;
+    bool allowSetupWhileArmed   (void) const override { return true; }
+    bool allowSetupWhileFlying  (void) const override { return true; }
 
 private:
     const QString   _name;