diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index 82ace3a8d..8b95c265c 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -513,24 +513,7 @@ class ModuleWindow : public Window {
       FormField::link(previousField, moduleChoice);
 
       // Module parameters
-      if (isModuleFlysky(moduleIdx)) {
-        grid.nextLine();
-        rfChoice = new Choice(this, grid.getFieldSlot(), STR_FLYSKY_PROTOCOLS, 0, 3,
-                   GET_DEFAULT(g_model.moduleData[moduleIdx].flysky.mode),
-                   [=](int32_t newValue) -> void {
-                     g_model.moduleData[moduleIdx].flysky.mode = newValue;
-                     SET_DIRTY();
-                     //TODO moduleFlagBackNormal(moduleIdx);
-                     //TODO onFlySkyReceiverSetPulse(INTERNAL_MODULE, newValue);
-                   });
-
-#if defined (PCBNV14)
-        grid.nextLine();
-        new StaticText(this, grid.getLabelSlot(true), STR_FLYSKY_TELEMETRY);
-        new CheckBox(this, grid.getFieldSlot(), GET_SET_DEFAULT(g_model.rssiAlarms.flysky_telemetry));
-#endif
-      }
-      else if (isModuleXJT(moduleIdx)) {
+      if (isModuleXJT(moduleIdx)) {
         auto xjtChoice = new Choice(this, grid.getFieldSlot(2, 1), STR_XJT_ACCST_RF_PROTOCOLS, MODULE_SUBTYPE_PXX1_OFF, MODULE_SUBTYPE_PXX1_ACCST_LR12,
                                     GET_SET_DEFAULT(g_model.moduleData[moduleIdx].rfProtocol));
         xjtChoice->setAvailableHandler([](int index) {
@@ -652,6 +635,24 @@ class ModuleWindow : public Window {
         new StaticText(this, grid.getLabelSlot(true), STR_MULTI_LOWPOWER);
         new CheckBox(this, grid.getFieldSlot(), GET_SET_DEFAULT(g_model.moduleData[moduleIdx].multi.lowPowerMode));
       }
+#endif
+#if defined (PCBNV14)
+      else if (isModuleFlysky(moduleIdx)) {
+        grid.nextLine();
+        rfChoice = new Choice(this, grid.getFieldSlot(), STR_FLYSKY_PROTOCOLS, 0, 3,
+                   GET_DEFAULT(g_model.moduleData[moduleIdx].flysky.mode),
+                   [=](int32_t newValue) -> void {
+                     g_model.moduleData[moduleIdx].flysky.mode = newValue;
+                     SET_DIRTY();
+                     //TODO moduleFlagBackNormal(moduleIdx);
+                     //TODO onFlySkyReceiverSetPulse(INTERNAL_MODULE, newValue);
+                   });
+
+
+        grid.nextLine();
+        new StaticText(this, grid.getLabelSlot(true), STR_FLYSKY_TELEMETRY);
+        new CheckBox(this, grid.getFieldSlot(), GET_SET_DEFAULT(g_model.rssiAlarms.flysky_telemetry));
+      }
 #endif
       grid.nextLine();