diff --git a/companion/src/modeledit/expodialog.cpp b/companion/src/modeledit/expodialog.cpp
index a71d87ebf..7b04620ff 100644
--- a/companion/src/modeledit/expodialog.cpp
+++ b/companion/src/modeledit/expodialog.cpp
@@ -3,11 +3,12 @@
 #include "eeprominterface.h"
 #include "helpers.h"
 
-ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, int stickMode) :
+ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, int stickMode, char * inputName) :
     QDialog(parent),
     ui(new Ui::ExpoDialog),
     model(model),
-    ed(expoData)
+    ed(expoData),
+    inputName(inputName)
 {
   ui->setupUi(this);
   QLabel * lb_fp[] = {ui->lb_FP0,ui->lb_FP1,ui->lb_FP2,ui->lb_FP3,ui->lb_FP4,ui->lb_FP5,ui->lb_FP6,ui->lb_FP7,ui->lb_FP8 };
@@ -76,7 +77,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, i
   }
 
   ui->inputName->setValidator(new QRegExpValidator(rx, this));
-  ui->inputName->setText(model.inputNames[ed->chn]);
+  ui->inputName->setText(inputName);
 
   ui->lineName->setValidator(new QRegExpValidator(rx, this));
   ui->lineName->setText(ed->name);
@@ -139,7 +140,7 @@ void ExpoDialog::valuesChanged()
     ed->mode   = ui->sideCB->currentIndex() + 1;
 
     strcpy(ed->name, ui->lineName->text().toAscii().data());
-    strcpy(model.inputNames[ed->chn], ui->inputName->text().toAscii().data());
+    strcpy(inputName, ui->inputName->text().toAscii().data());
 
     ed->phases=0;
     for (int i=8; i>=0 ; i--) {
diff --git a/companion/src/modeledit/expodialog.h b/companion/src/modeledit/expodialog.h
index 2d96b130a..ddb3d750c 100644
--- a/companion/src/modeledit/expodialog.h
+++ b/companion/src/modeledit/expodialog.h
@@ -14,7 +14,7 @@ namespace Ui {
 class ExpoDialog : public QDialog {
     Q_OBJECT
   public:
-    ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, int stickMode);
+    ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expodata, int stickMode, char * inputName);
     ~ExpoDialog();
 
   protected:
@@ -28,6 +28,7 @@ class ExpoDialog : public QDialog {
     Ui::ExpoDialog * ui;
     ModelData & model;
     ExpoData * ed;
+    char * inputName;
     GVarGroup * gvGroup;
     CurveGroup * curveGroup;
 };
diff --git a/companion/src/modeledit/inputs.cpp b/companion/src/modeledit/inputs.cpp
index a6e1f6eac..6096c8cdf 100644
--- a/companion/src/modeledit/inputs.cpp
+++ b/companion/src/modeledit/inputs.cpp
@@ -169,12 +169,18 @@ void InputsPanel::gm_openExpo(int index)
     if(index<0 || index>=C9X_MAX_EXPOS) return;
 
     ExpoData mixd(model.expoData[index]);
+    char inputName[4+1];
     emit modified();
     update();
+    
+    if (GetEepromInterface()->getCapability(VirtualInputs))
+      strcpy(inputName, model.inputNames[mixd.chn]);
 
-    ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings.stickMode);
+    ExpoDialog *g = new ExpoDialog(this, model, &mixd, generalSettings.stickMode, inputName);
     if (g->exec())  {
       model.expoData[index] = mixd;
+      if (GetEepromInterface()->getCapability(VirtualInputs))
+        strcpy(model.inputNames[mixd.chn], inputName);
       emit modified();
       update();
     }