diff --git a/src/AutoPilotPlugins/Common/ESP8266Component.qml b/src/AutoPilotPlugins/Common/ESP8266Component.qml
index 864ee1d4025c703652d8e4fe86bf57f75e0050c8..dc439514d49bb6b8c51cab46b70a83947fed122d 100644
--- a/src/AutoPilotPlugins/Common/ESP8266Component.qml
+++ b/src/AutoPilotPlugins/Common/ESP8266Component.qml
@@ -168,7 +168,7 @@ QGCView {
                                 QGCComboBox {
                                     id:                     channelField
                                     width:                  _editFieldWidth
-                                    enabled:                wifiMode && wifiMode.value === 0
+                                    enabled:                wifiMode ? wifiMode.value === 0 : true
                                     model:                  controller.wifiChannels
                                     currentIndex:           wifiChannel ? wifiChannel.value - 1 : 0
                                     onActivated: {
diff --git a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
index 5165384a143c22f628758212c94cbf44530ba8de..3720a1e751961bb983a6eb531ed77aa414701d2d 100644
--- a/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
+++ b/src/AutoPilotPlugins/Common/ESP8266ComponentSummary.qml
@@ -38,8 +38,9 @@ FactPanel {
             valueText: wifiMode ? (wifiMode.value === 0 ? "AP Mode" : "Station Mode") : "AP Mode"
         }
         VehicleSummaryRow {
-            labelText: qsTr("WiFi Channel:")
-            valueText: wifiChannel ? wifiChannel.valueString : ""
+            labelText:  qsTr("WiFi Channel:")
+            valueText:  wifiChannel ? wifiChannel.valueString : ""
+            visible:    wifiMode ? wifiMode.value === 0 : true
         }
         VehicleSummaryRow {
             labelText: qsTr("WiFi AP SSID:")