diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml
index 0bf754ae6c8e4cd41287561905fa90042b30de84..9c9bffeb05c947141e46f1b5a4a2c82cd01ad24c 100644
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -93,7 +93,7 @@ Rectangle {
 
             CameraSection {
                 id:         cameraSection
-                checked:    missionItem.cameraSection.settingsSpecified
+                checked:    !_waypointsOnlyMode && missionItem.cameraSection.settingsSpecified
                 visible:    _showCameraSection
             }
 
diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml
index 46be07cf864d674e163a5603d7a70c257d911f10..15f81051084a0e17a4f27c23f544907f47fe33a4 100644
--- a/src/PlanView/PlanView.qml
+++ b/src/PlanView/PlanView.qml
@@ -588,7 +588,7 @@ QGCView {
                 rotateImage:        [ masterController.syncInProgress, false, false, false, false, false, false ]
                 animateImage:       [ masterController.dirty, false, false, false, false, false, false ]
                 buttonEnabled:      [ !masterController.syncInProgress, true, true, true, true, true, true ]
-                buttonVisible:      [ true, true, false/*_waypointsOnlyMode*/, true, true, _showZoom, _showZoom ]
+                buttonVisible:      [ true, true, _waypointsOnlyMode, true, true, _showZoom, _showZoom ]
                 maxHeight:          mapScale.y - toolStrip.y
 
                 property bool _showZoom: !ScreenTools.isMobile