diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml
index 28c15bf353bc6cca3edf34b74f7248e95cc5fc22..6823ad080ec964806c72957dc9382f959caa470e 100644
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -84,60 +84,6 @@ Rectangle {
             anchors.top:    parent ? parent.top   : undefined
             spacing:        _margin
 
-            SectionHeader {
-                id:         missionDefaultsSectionHeader
-                text:       qsTr("Mission Defaults")
-                checked:    true
-                showSpacer: false
-            }
-
-            Column {
-                anchors.left:   parent.left
-                anchors.right:  parent.right
-                spacing:        _margin
-                visible:        missionDefaultsSectionHeader.checked
-
-                GridLayout {
-                    anchors.left:   parent.left
-                    anchors.right:  parent.right
-                    columnSpacing:  ScreenTools.defaultFontPixelWidth
-                    rowSpacing:     columnSpacing
-                    columns:        2
-
-                    QGCLabel {
-                        text:       qsTr("Waypoint alt")
-                    }
-                    FactTextField {
-                        fact:               QGroundControl.settingsManager.appSettings.defaultMissionItemAltitude
-                        Layout.fillWidth:   true
-                    }
-
-                    QGCCheckBox {
-                        id:         flightSpeedCheckBox
-                        text:       qsTr("Flight speed")
-                        visible:    !_missionVehicle.vtol
-                        checked:    missionItem.speedSection.specifyFlightSpeed
-                        onClicked:   missionItem.speedSection.specifyFlightSpeed = checked
-                    }
-                    FactTextField {
-                        Layout.fillWidth:   true
-                        fact:               missionItem.speedSection.flightSpeed
-                        visible:            flightSpeedCheckBox.visible
-                        enabled:            flightSpeedCheckBox.checked
-                    }
-                } // GridLayout
-
-                QGCCheckBox {
-                    text:       qsTr("RTL after mission end")
-                    checked:    missionItem.missionEndRTL
-                    onClicked:  missionItem.missionEndRTL = checked
-                }
-            }
-
-            CameraSection {
-                checked: missionItem.cameraSection.settingsSpecified
-            }
-
             SectionHeader {
                 id:         vehicleInfoSectionHeader
                 text:       qsTr("Vehicle Info")
@@ -245,6 +191,83 @@ Rectangle {
                     anchors.horizontalCenter:   parent.horizontalCenter
                 }
             }
+
+            SectionHeader {
+                id:         missionDefaultsSectionHeader
+                text:       qsTr("Mission Defaults")
+                checked:    true
+            }
+
+            Column {
+                anchors.left:   parent.left
+                anchors.right:  parent.right
+                spacing:        _margin
+                visible:        missionDefaultsSectionHeader.checked
+
+                GridLayout {
+                    anchors.left:   parent.left
+                    anchors.right:  parent.right
+                    columnSpacing:  ScreenTools.defaultFontPixelWidth
+                    rowSpacing:     columnSpacing
+                    columns:        2
+
+                    QGCLabel {
+                        text:       qsTr("Waypoint alt")
+                    }
+                    FactTextField {
+                        fact:               QGroundControl.settingsManager.appSettings.defaultMissionItemAltitude
+                        Layout.fillWidth:   true
+                    }
+
+                    QGCCheckBox {
+                        id:         flightSpeedCheckBox
+                        text:       qsTr("Flight speed")
+                        visible:    !_missionVehicle.vtol
+                        checked:    missionItem.speedSection.specifyFlightSpeed
+                        onClicked:   missionItem.speedSection.specifyFlightSpeed = checked
+                    }
+                    FactTextField {
+                        Layout.fillWidth:   true
+                        fact:               missionItem.speedSection.flightSpeed
+                        visible:            flightSpeedCheckBox.visible
+                        enabled:            flightSpeedCheckBox.checked
+                    }
+                } // GridLayout
+            }
+
+            SectionHeader {
+                id:         missionEndHeader
+                text:       qsTr("Mission End")
+                checked:    true
+                showSpacer: false
+            }
+
+            Column {
+                anchors.left:   parent.left
+                anchors.right:  parent.right
+                spacing:        _margin
+                visible:        missionEndHeader.checked
+
+                FactCheckBox {
+                    text:   qsTr("Return To Launch")
+                    fact:   missionItem.missionEndRTL
+                }
+            }
+
+            CameraSection {
+                id:         cameraSection
+                checked:    missionItem.cameraSection.settingsSpecified
+            }
+
+            QGCLabel {
+                anchors.left:           parent.left
+                anchors.right:          parent.right
+                text:                   qsTr("Above camera commands will take effect immediately upon mission start.")
+                wrapMode:               Text.WordWrap
+                horizontalAlignment:    Text.AlignHCenter
+                font.pointSize:         ScreenTools.smallFontPointSize
+                visible:                cameraSection.checked
+            }
         } // Column
     } // Deferred loader
 } // Rectangle