diff --git a/src/PlanView/MissionSettingsEditor.qml b/src/PlanView/MissionSettingsEditor.qml
index 2957ab9f4314c56a74a830094ddbff505cf15e7f..db73936871fbb02defa27681c43bc4520ca65c65 100644
--- a/src/PlanView/MissionSettingsEditor.qml
+++ b/src/PlanView/MissionSettingsEditor.qml
@@ -75,9 +75,9 @@ Rectangle {
 
         Column {
             id:             valuesColumn
-            anchors.left:   parent.left
-            anchors.right:  parent.right
-            anchors.top:    parent.top
+            anchors.left:   parent ? parent.left  : undefined
+            anchors.right:  parent ? parent.right : undefined
+            anchors.top:    parent ? parent.top   : undefined
             spacing:        _margin
 
             SectionHeader {
diff --git a/src/QmlControls/QGCFileDialog.qml b/src/QmlControls/QGCFileDialog.qml
index 17d719a5d8e831a82e1b0b449680af4673cb0ad0..2e3bb9dabed2d6a763c40ee9fb62d4537848210a 100644
--- a/src/QmlControls/QGCFileDialog.qml
+++ b/src/QmlControls/QGCFileDialog.qml
@@ -56,7 +56,7 @@ Item {
     FileDialog {
         id:             fullFileDialog
         folder:         "file://" + _root.folder
-        nameFilters:    _root.nameFilters
+        nameFilters:    _root.nameFilters ? _root.nameFilters : []
         title:          _root.title
         selectExisting: _root.selectExisting
         selectMultiple: false