diff --git a/companion/src/simulation/simulateduiwidgetX7.cpp b/companion/src/simulation/simulateduiwidgetX7.cpp
index 03c855be2..727efc329 100644
--- a/companion/src/simulation/simulateduiwidgetX7.cpp
+++ b/companion/src/simulation/simulateduiwidgetX7.cpp
@@ -42,7 +42,7 @@ SimulatedUIWidgetX7::SimulatedUIWidgetX7(SimulatorInterface *simulator, Simulato
   m_backlightColors << QColor(247,242,159);
 
   setLcd(ui->lcd);
-  connectScrollActions();
+
   // try to match the gradient on the white radio images.
   m_simuDialog->setUiAreaStyle("background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, " \
                              "stop:0 rgba(255, 255, 255, 255), " \
diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index 0013ec253..973f3ed2a 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -98,6 +98,8 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator
 
   ui->radioUiWidget->layout()->removeItem(ui->radioUiTempSpacer);
   ui->radioUiWidget->layout()->addWidget(radioUiWidget);
+  radioUiWidget->setFocusPolicy(Qt::WheelFocus);
+  radioUiWidget->setFocus();
 
   vJoyLeft = new VirtualJoystickWidget(this, 'L');
   ui->leftStickLayout->addWidget(vJoyLeft);
diff --git a/companion/src/simulation/simulatorstartupdialog.cpp b/companion/src/simulation/simulatorstartupdialog.cpp
index a236a8971..b09d254e4 100644
--- a/companion/src/simulation/simulatorstartupdialog.cpp
+++ b/companion/src/simulation/simulatorstartupdialog.cpp
@@ -86,7 +86,7 @@ void SimulatorStartupDialog::changeEvent(QEvent *e)
 // FIXME : need a better way to check for this
 bool SimulatorStartupDialog::usesCategorizedStorage(const QString & name)
 {
-  return name.contains("x12s", Qt::CaseInsensitive) || name.contains("x10", Qt::CaseInsensitive);
+  return name.contains(QRegExp("(x12|x10|horus)", Qt::CaseInsensitive));
 }
 
 bool SimulatorStartupDialog::usesCategorizedStorage()