diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 58bc43a53da826318ad45dbe148e04ecc61b56f1..48d0a0831a3210ff56ee39912ecb79fcb92f717f 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -58,6 +58,7 @@ QGCViewDialog {
             }
             fact.value = value;
             fact.valueChanged(fact.value)
+            hideDialog();
         }
         else */ if (factCombo.visible) {
             fact.enumIndex = factCombo.currentIndex
@@ -152,10 +153,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]