diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp
index 3938fa98a..d316c6596 100644
--- a/companion/src/generaledit.cpp
+++ b/companion/src/generaledit.cpp
@@ -380,6 +380,14 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
       ui->pot3Type->hide();
       ui->pot3TypeLabel->hide();
     }
+    
+    if (IS_TARANIS(eepromInterface->getBoard())) {
+      ui->serialPortMode->setCurrentIndex(g_eeGeneral.hw_uartMode);
+    }
+    else {
+      ui->serialPortMode->hide();
+      ui->serialPortLabel->hide();
+    }
 }
 
 GeneralEdit::~GeneralEdit()
@@ -405,6 +413,12 @@ void GeneralEdit::on_pot3Type_currentIndexChanged(int index)
   updateSettings();
 }
 
+void GeneralEdit::on_serialPortMode_currentIndexChanged(int index)
+{
+  g_eeGeneral.hw_uartMode = index;
+  updateSettings();
+}
+
 void GeneralEdit::unlockSwitchEdited()
 {
   int i=0;
diff --git a/companion/src/generaledit.h b/companion/src/generaledit.h
index ca9911b74..c44e97fe4 100644
--- a/companion/src/generaledit.h
+++ b/companion/src/generaledit.h
@@ -122,6 +122,7 @@ private slots:
     void on_pot1Type_currentIndexChanged(int index);
     void on_pot2Type_currentIndexChanged(int index);
     void on_pot3Type_currentIndexChanged(int index);
+    void on_serialPortMode_currentIndexChanged(int index);
 
     void on_stickmodeCB_currentIndexChanged(int index);
     void on_channelorderCB_currentIndexChanged(int index);
diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui
index 3eb53be8b..f60cfd30a 100644
--- a/companion/src/generaledit.ui
+++ b/companion/src/generaledit.ui
@@ -3626,6 +3626,35 @@ p, li { white-space: pre-wrap; }
          </item>
         </widget>
        </item>
+       <item row="6" column="3">
+        <widget class="QComboBox" name="serialPortMode">
+         <item>
+          <property name="text">
+           <string>OFF</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>S-Port Mirror</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Debug</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="6" column="2">
+        <widget class="QLabel" name="serialPortLabel">
+         <property name="text">
+          <string>Serial Port</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>