diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index f3e76069eab49a17968b5fc691eebb728309e2a8..0083f2a83b71c6e814b98cc62a3b7a8679c3641d 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -85,6 +85,11 @@ QGCViewDialog {
         }
     }
 
+	// set focus to the text field when becoming visible (in case of an Enum,
+	// the valueField is not visible, but it's not an issue because the combo
+	// box cannot have a focus)
+	onVisibleChanged: if (visible) valueField.forceActiveFocus()
+
     QGCFlickable {
         anchors.fill:       parent
         contentHeight:      _column.y + _column.height