diff --git a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml
index f0da718fa250bf75a01a243f8bc267a193faf9c7..480d3213d31c662ad1eabad7fef12d64d04521c9 100644
--- a/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml
+++ b/src/FirmwarePlugin/APM/CopterGeoFenceEditor.qml
@@ -43,6 +43,8 @@ Column {
             width:  editorColumn.width
             height: textField.height
 
+            property bool showCombo: modelData.enumStrings.length > 0
+
             QGCLabel {
                 id:                 textFieldLabel
                 anchors.baseline:   textField.baseline
@@ -55,7 +57,7 @@ Column {
                 width:          _editFieldWidth
                 showUnits:      true
                 fact:           modelData
-                visible:        !comboField.visible
+                visible:        !parent.showCombo
             }
 
             FactComboBox {
@@ -63,8 +65,8 @@ Column {
                 anchors.right:  parent.right
                 width:          _editFieldWidth
                 indexModel:     false
-                fact:           visible ? modelData : _nullFact
-                visible:        modelData.enumStrings.length
+                fact:           showCombo ? modelData : _nullFact
+                visible:        parent.showCombo
 
                 property var _nullFact: Fact { }
             }