diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
index 56af19517..33c582315 100644
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
@@ -170,6 +170,13 @@ ConfigOutputWidget::ConfigOutputWidget(QWidget *parent) : ConfigTaskWidget(paren
         this->setEnabled(false);
     connect(obj,SIGNAL(objectUpdated(UAVObject*)),this,SLOT(disableIfNotMe(UAVObject*)));
 }
+void ConfigOutputWidget::enableControls(bool enable)
+{
+    ConfigTaskWidget::enableControls(enable);
+    if(!enable)
+        m_config->channelOutTest->setChecked(false);
+    m_config->channelOutTest->setEnabled(enable);
+}
 
 ConfigOutputWidget::~ConfigOutputWidget()
 {
@@ -216,6 +223,7 @@ void ConfigOutputWidget::linkToggled(bool state)
   */
 void ConfigOutputWidget::runChannelTests(bool state)
 {
+    qDebug()<<"configoutputwidget runChannelTests"<<state;
     SystemAlarms * systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
     SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData();
 
diff --git a/ground/openpilotgcs/src/plugins/config/configoutputwidget.h b/ground/openpilotgcs/src/plugins/config/configoutputwidget.h
index 8733fb314..8f92a296b 100644
--- a/ground/openpilotgcs/src/plugins/config/configoutputwidget.h
+++ b/ground/openpilotgcs/src/plugins/config/configoutputwidget.h
@@ -46,6 +46,7 @@ public:
         ConfigOutputWidget(QWidget *parent = 0);
         ~ConfigOutputWidget();
 
+
 private:
         Ui_OutputWidget *m_config;
 
@@ -82,6 +83,8 @@ private slots:
 	void linkToggled(bool state);
         void setSpinningArmed(bool val);
         void openHelp();
+protected:
+        void enableControls(bool enable);
 };
 
 #endif