diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 58bc43a53da826318ad45dbe148e04ecc61b56f1..8de10d0fbce41507bd1a5c080b09a768315254e4 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -47,7 +47,6 @@ QGCViewDialog {
     QGCPalette { id: qgcPal; colorGroupEnabled: true }
 
     function accept() {
-        /*
         if (bitmaskEditor.visible) {
             var value = 0;
             for (var i = 0; i < fact.bitmaskValues.length; ++i) {
@@ -58,8 +57,9 @@ QGCViewDialog {
             }
             fact.value = value;
             fact.valueChanged(fact.value)
+            hideDialog();
         }
-        else */ if (factCombo.visible) {
+        else if (factCombo.visible) {
             fact.enumIndex = factCombo.currentIndex
             hideDialog()
         } else {
@@ -152,10 +152,11 @@ QGCViewDialog {
 
             Column {
                 spacing: ScreenTools.defaultFontPixelHeight / 2
-
+                visible: fact.bitmaskStrings.length > 0 ? true : false;
                 Repeater {
                     id: bitmaskEditor
                     model: fact.bitmaskStrings
+
                     delegate : QGCCheckBox {
                         text : modelData
                         checked : fact.value & fact.bitmaskValues[index]