diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
index 00387720a..921e916bc 100644
--- a/companion/src/modeledit/expodialog.cpp
+++ b/companion/src/modeledit/expodialog.cpp
@@ -62,6 +62,10 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
     ui->trimCB->hide();
   }
 
+  ui->trimCB->addItem(tr("Rud"), 1);
+  ui->trimCB->addItem(tr("Ele"), 2);
+  ui->trimCB->addItem(tr("Thr"), 3);
+  ui->trimCB->addItem(tr("Ail"), 4);
   ui->trimCB->setCurrentIndex(1 - ed->carryTrim);
 
   int expolength = GetEepromInterface()->getCapability(HasExpoNames);
@@ -81,12 +85,13 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
 
   valuesChanged();
 
-  connect(ui->lineName,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
-  connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-  connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
-  connect(ui->sideCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
+  connect(ui->lineName,SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
+  connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(ui->trimCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(ui->sideCB,SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
   for (int i=0; i<9; i++) {
-    connect(cb_fp[i],SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
+    connect(cb_fp[i], SIGNAL(toggled(bool)), this, SLOT(valuesChanged()));
   }
   QTimer::singleShot(0, this, SLOT(shrink()));
 }
@@ -115,6 +120,7 @@ void ExpoDialog::valuesChanged()
     QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
 
     ed->srcRaw  = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt());
+    ed->carryTrim = 1 - ui->trimCB->currentIndex();
     ed->swtch  = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
     ed->mode   = ui->sideCB->currentIndex() + 1;
 
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index 2ffbcdd66..1376abb68 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -88,6 +88,12 @@ void InputsPanel::update()
 
     if (GetEepromInterface()->getCapability(VirtualInputs)) {
       str += " " + tr("Source(%1)").arg(md->srcRaw.toString());
+      if (md->carryTrim>0) {
+        str += " " + tr("No Trim");
+      }
+      else if (md->carryTrim<0) {
+        str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+      }
     }
     else {
       switch (md->mode) {
diff --git a/companion/src/modeledit/mixerdialog.cpp b/companion/src/modeledit/mixerdialog.cpp
index 85a9c4a90..4dc69cd12 100644
--- a/companion/src/modeledit/mixerdialog.cpp
+++ b/companion/src/modeledit/mixerdialog.cpp
@@ -45,7 +45,6 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, i
     ui->trimCB->addItem(tr("Ele"), 2);
     ui->trimCB->addItem(tr("Thr"), 3);
     ui->trimCB->addItem(tr("Ail"), 4);
-
     ui->trimCB->setCurrentIndex(1 - md->carryTrim);
 
     int namelength = GetEepromInterface()->getCapability(HasMixerNames);
diff --git a/companion/src/modeledit/mixes.cpp b/companion/src/modeledit/mixes.cpp
index 5e1fb7769..ed6016e57 100644
--- a/companion/src/modeledit/mixes.cpp
+++ b/companion/src/modeledit/mixes.cpp
@@ -112,11 +112,13 @@ void MixesPanel::update()
 
     if (md->swtch.type != SWITCH_TYPE_NONE) str += " " + tr("Switch(%1)").arg(md->swtch.toString());
 
-    if (md->carryTrim>0) {
-      str += " " + tr("No Trim");
-    }
-    else if (md->carryTrim<0) {
-      str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+    if (!GetEepromInterface()->getCapability(VirtualInputs)) {
+      if (md->carryTrim>0) {
+        str += " " + tr("No Trim");
+      }
+      else if (md->carryTrim<0) {
+        str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+      }
     }
 
     if (md->noExpo)      str += " " + tr("No DR/Expo");