diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 31acede4dcef9247cac7b5c6197a86b9beface5c..d44cfdebfea102ead15f083be47132c1cae9dff7 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -83,17 +83,6 @@ QGCViewDialog {
             anchors.left:   parent.left
             anchors.right:  parent.right
 
-            // Checkbox to allow manual entry of enumerated or bitmask parameters
-            QGCCheckBox {
-                id:         manualEntry
-                visible:    factCombo.visible || bitmaskColumn.visible
-                text:       qsTr("Manual Entry (Advanced User)")
-
-                onClicked: {
-                    valueField.text = fact.valueString
-                }
-            }
-
             QGCLabel {
                 id:         validationError
                 width:      parent.width
@@ -234,7 +223,7 @@ QGCViewDialog {
             Row {
                 width:      parent.width
                 spacing:    ScreenTools.defaultFontPixelWidth / 2
-                visible:    showRCToParam
+                visible:    showRCToParam || factCombo.visible || bitmaskColumn.visible
 
                 Rectangle {
                     height: 1
@@ -256,6 +245,17 @@ QGCViewDialog {
                 }
             }
 
+            // Checkbox to allow manual entry of enumerated or bitmask parameters
+            QGCCheckBox {
+                id:         manualEntry
+                visible:    _advanced.checked && (factCombo.visible || bitmaskColumn.visible)
+                text:       qsTr("Manual Entry")
+
+                onClicked: {
+                    valueField.text = fact.valueString
+                }
+            }
+
             QGCButton {
                 text:           qsTr("Set RC to Param...")
                 width:          _editFieldWidth