diff --git a/src/MissionManager/Survey.SettingsGroup.json b/src/MissionManager/Survey.SettingsGroup.json
index 5d4ef9c2d875756b96772ef6b9d27e67035655aa..e28cb354aa95538a24f45eaf593279e020e1e29f 100644
--- a/src/MissionManager/Survey.SettingsGroup.json
+++ b/src/MissionManager/Survey.SettingsGroup.json
@@ -132,7 +132,7 @@
     "name":             "CameraTriggerInTurnaround",
     "shortDescription": "Camera continues taking images in turnarounds.",
     "type":             "bool",
-    "defaultValue":     false
+    "defaultValue":     true
 },
 {
     "name":             "HoverAndCapture",
diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml
index e5fed5d0137a4f6865e0eedd0d1a6ed127f99fae..8c688e4505fb4444ac41df13f08ece4ed2a75532 100644
--- a/src/PlanView/SurveyItemEditor.qml
+++ b/src/PlanView/SurveyItemEditor.qml
@@ -252,12 +252,6 @@ Rectangle {
                     enabled:            cameraTriggerDistanceCheckBox.checked
                 }
             }
-
-            FactCheckBox {
-                text:       qsTr("Hover and capture image")
-                fact:       missionItem.hoverAndCapture
-                visible:    missionItem.hoverAndCaptureAllowed
-            }
         }
 
         // Camera based grid ui
@@ -387,6 +381,23 @@ Rectangle {
                 }
             }
 
+            FactCheckBox {
+                text:       qsTr("Hover and capture image")
+                fact:       missionItem.hoverAndCapture
+                visible:    missionItem.hoverAndCaptureAllowed
+                onClicked: {
+                    if (checked) {
+                        missionItem.cameraTriggerInTurnaround.rawValue = false
+                    }
+                }
+            }
+
+            FactCheckBox {
+                text:       qsTr("Take images in turnarounds")
+                fact:       missionItem.cameraTriggerInTurnaround
+                enabled:    !missionItem.hoverAndCapture.rawValue
+            }
+
             SectionHeader {
                 id:     gridHeader
                 text:   qsTr("Grid")