diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index b8e4f6e41d95002397ac3ad65df7541d4889b4b5..7e5f732ea68d0b135ebdd79f3b6c8e7d14aa595c 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -36,11 +36,10 @@ QGCViewDialog {
     QGCPalette { id: qgcPal; colorGroupEnabled: true }
 
     function accept() {
-        /*
-        if (bitmaskEditor.visible) {
+        if (bitmaskColumn.visible) {
             var value = 0;
             for (var i = 0; i < fact.bitmaskValues.length; ++i) {
-                var checkbox = bitmaskEditor.itemAt(i)
+                var checkbox = bitmaskRepeater.itemAt(i)
                 if (checkbox.checked) {
                     value |= fact.bitmaskValues[i];
                 }
@@ -48,8 +47,7 @@ QGCViewDialog {
             fact.value = value;
             fact.valueChanged(fact.value)
             hideDialog();
-        }
-        else */ if (factCombo.visible) {
+        } else if (factCombo.visible) {
             fact.enumIndex = factCombo.currentIndex
             hideDialog()
         } else {
@@ -142,11 +140,13 @@ QGCViewDialog {
             }
 
             Column {
-                spacing: ScreenTools.defaultFontPixelHeight / 2
-                visible: fact.bitmaskStrings.length > 0 ? true : false;
+                id:         bitmaskColumn
+                spacing:    ScreenTools.defaultFontPixelHeight / 2
+                visible:    fact.bitmaskStrings.length > 0 ? true : false;
+
                 Repeater {
-                    id: bitmaskEditor
-                    model: fact.bitmaskStrings
+                    id:     bitmaskRepeater
+                    model:  fact.bitmaskStrings
 
                     delegate : QGCCheckBox {
                         text : modelData