diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index ccd7a6e27d6d531dd65a87443bd52f56d5392481..5ec4dbb79d42bf85394ff9714c28291af87f08ee 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -138,7 +138,9 @@ QGCViewDialog {
                 }
 
                 onCurrentIndexChanged: {
-                    valueField.text = fact.enumValues[currentIndex]
+                    if (currentIndex >=0 && currentIndex < model.length) {
+                        valueField.text = fact.enumValues[currentIndex]
+                    }
                 }
             }