diff --git a/companion/src/firmwares/modeldata.cpp b/companion/src/firmwares/modeldata.cpp
index aea7d88e6..b615fd649 100644
--- a/companion/src/firmwares/modeldata.cpp
+++ b/companion/src/firmwares/modeldata.cpp
@@ -311,7 +311,7 @@ void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
       return;
     if (p == phaseIdx || phaseIdx == 0) {
       trim = value;
-      break;;
+      break;
     }
     else if (mode == 0) {
       phaseIdx = p;
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index d2af0771f..d305f3c19 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -519,6 +519,11 @@ uint32_t readTrims()
     }
   }
 
+#if defined(PCBXLITE)
+  if (IS_SHIFT_PRESSED())
+    result = ((result & 0x03) << 6) | ((result & 0x0c) << 2);
+#endif
+
   return result;
 }
 
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 5bbf2ba78..a1ef63652 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -266,7 +266,11 @@ enum EnumKeys
 
 #if defined(KEYS_GPIO_PIN_SHIFT)
 #define IS_SHIFT_KEY(index)             (index == KEY_SHIFT)
+#if defined(SIMU)
+#define IS_SHIFT_PRESSED()              (readKeys() & (1 << KEY_SHIFT))
+#else
 #define IS_SHIFT_PRESSED()              (~KEYS_GPIO_REG_SHIFT & KEYS_GPIO_PIN_SHIFT)
+#endif
 #else
 #define IS_SHIFT_KEY(index)             (false)
 #define IS_SHIFT_PRESSED()              (false)