diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index 6a48aa968..45d0f2b12 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -3473,6 +3473,10 @@ void OpenTxModelData::afterImport()
     }
   }
 
+  if (IS_HORUS(board)) {
+    modelData.moduleData[0].protocol = PULSES_PXX_XJT_X16;
+  }
+
   for (int module=0; module<3; module++) {
     if (modelData.moduleData[module].protocol == PULSES_PXX_XJT_X16 || modelData.moduleData[module].protocol == PULSES_LP45) {
       if (subprotocols[module] >= 0)
diff --git a/companion/src/firmwares/opentx/opentxeeprom.h b/companion/src/firmwares/opentx/opentxeeprom.h
index 8cb7d3968..67c55bce6 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.h
+++ b/companion/src/firmwares/opentx/opentxeeprom.h
@@ -99,7 +99,7 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PULSES_DSMX, val++);
       }
       if (IS_HORUS_OR_TARANIS(board)) {
-    	  addConversion(PULSES_CROSSFIRE, val++);
+        addConversion(PULSES_CROSSFIRE, val++);
         addConversion(PULSES_MULTIMODULE, val++);
       }
     }
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 81a60f5c9..803cbb1e6 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -238,9 +238,9 @@ ModulePanel::ModulePanel(QWidget * parent, ModelData & model, ModuleData & modul
   lock = false;
 
   // a change will not register if only one item was added
-  if (ui->protocol->count() == 1)
+  if (ui->protocol->count() == 1) {
     on_protocol_currentIndexChanged(ui->protocol->currentIndex());
-
+  }
 }
 
 ModulePanel::~ModulePanel()
@@ -406,8 +406,9 @@ void ModulePanel::update()
     mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
   }
 
-  if (moduleHasFailsafes())
+  if (moduleHasFailsafes()) {
     mask |= MASK_FAILSAFES;
+  }
 
   ui->label_protocol->setVisible(mask & MASK_PROTOCOL);
   ui->protocol->setVisible(mask & MASK_PROTOCOL);