diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 54b1ac8..8834f0a 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -59,6 +59,7 @@ QGCViewDialog {
             validationError.text = fact.validate(validateValue, false /* convertOnly */)
             forceSave.visible = true
         }
+        valueField.forceActiveFocus();
     }
 
     Column {
@@ -82,6 +83,14 @@ QGCViewDialog {
         QGCTextField {
             id:     valueField
             text:   validate ? validateValue : fact.valueString
+
+            onAccepted: accept()
+
+            Keys.onReleased: {
+                if (event.key == Qt.Key_Escape) {
+                    reject()
+                }
+            }
         }
 
         QGCLabel { text: fact.name }