diff --git a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp
index b8faa0fcb..060c2f7e2 100644
--- a/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp
+++ b/ground/openpilotgcs/src/plugins/config/inputchannelform.cpp
@@ -2,6 +2,7 @@
 #include "ui_inputchannelform.h"
 
 #include "manualcontrolsettings.h"
+#include "gcsreceiver.h"
 
 inputChannelForm::inputChannelForm(QWidget *parent,bool showlegend) :
     QWidget(parent),
@@ -108,7 +109,7 @@ void inputChannelForm::groupUpdated()
         count = 18;
         break;
     case ManualControlSettings::CHANNELGROUPS_GCS:
-        count = 5;
+        count = GCSReceiver::CHANNEL_NUMELEM;
         break;
     case ManualControlSettings::CHANNELGROUPS_NONE:
         count = 0;
diff --git a/shared/uavobjectdefinition/gcsreceiver.xml b/shared/uavobjectdefinition/gcsreceiver.xml
index d21598e48..81af8a5d5 100644
--- a/shared/uavobjectdefinition/gcsreceiver.xml
+++ b/shared/uavobjectdefinition/gcsreceiver.xml
@@ -1,7 +1,7 @@
 <xml>
     <object name="GCSReceiver" singleinstance="true" settings="false">
         <description>A receiver channel group carried over the telemetry link.</description>
-	<field name="Channel" units="us" type="uint16" elements="6"/>
+        <field name="Channel" units="us" type="uint16" elements="8"/>
         <access gcs="readwrite" flight="readonly"/>
         <telemetrygcs acked="false" updatemode="onchange" period="0"/>
         <telemetryflight acked="false" updatemode="never" period="0"/>