diff --git a/companion/src/generaledit/hardware.cpp b/companion/src/generaledit/hardware.cpp
index ed88b2807..d8ae948e7 100644
--- a/companion/src/generaledit/hardware.cpp
+++ b/companion/src/generaledit/hardware.cpp
@@ -158,7 +158,8 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
   }
 
   if (IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board)|| IS_TARANIS_X9E(board) || IS_HORUS(board)) {
-    ui->bluetoothMode->setCurrentIndex(generalSettings.bluetoothMode);
+    ui->bluetoothMode->setAutoIndexes();
+    ui->bluetoothMode->setField(generalSettings.bluetoothMode, this);
     ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
   }
   else {
@@ -238,12 +239,6 @@ void HardwarePanel::on_txCurrentCalibration_editingFinished()
   }
 }
 
-void HardwarePanel::on_bluetoothMode_stateChanged(int index)
-{
-  generalSettings.bluetoothMode = index;
-  emit modified();
-}
-
 void HardwarePanel::setValues()
 {
   ui->txVoltageCalibration->setValue((double)generalSettings.txVoltageCalibration/10);
diff --git a/companion/src/generaledit/hardware.h b/companion/src/generaledit/hardware.h
index eb1decd50..07ba62c40 100644
--- a/companion/src/generaledit/hardware.h
+++ b/companion/src/generaledit/hardware.h
@@ -48,7 +48,6 @@ class HardwarePanel : public GeneralPanel
 
     void on_txCurrentCalibration_editingFinished();
     void on_txVoltageCalibration_editingFinished();
-    void on_bluetoothMode_stateChanged(int);
     void on_filterEnable_stateChanged();
 
     void on_serialPortMode_currentIndexChanged(int index);
diff --git a/companion/src/generaledit/hardware.ui b/companion/src/generaledit/hardware.ui
index 93356ce78..872e96ad5 100644
--- a/companion/src/generaledit/hardware.ui
+++ b/companion/src/generaledit/hardware.ui
@@ -1099,7 +1099,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="QComboBox" name="bluetoothMode">
+       <widget class="AutoComboBox" name="bluetoothMode">
         <property name="text" stdset="0">
          <string/>
         </property>