diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatordialog.cpp
index be04db15d..379785f8d 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatordialog.cpp
@@ -424,7 +424,7 @@ void SimulatorDialog::setupUi()
 #endif
 
   if (firmware->getCapability(Capability(SportTelemetry)))
-    keymapHelp.append(keymapHelp_t(ui->btn_telemSim->shortcut().toString(QKeySequence::NativeText), ui->btn_luaReload->statusTip()));
+    keymapHelp.append(keymapHelp_t(ui->btn_telemSim->shortcut().toString(QKeySequence::NativeText), ui->btn_telemSim->statusTip()));
   else
     ui->btn_telemSim->hide();
 
@@ -432,7 +432,7 @@ void SimulatorDialog::setupUi()
   keymapHelp.append(keymapHelp_t(ui->btn_debugConsole->shortcut().toString(QKeySequence::NativeText), ui->btn_debugConsole->statusTip()));
 
   if (!firmware->getCapability(Capability(LuaInputsPerScript)))  // hackish! but using "LuaScripts" checks for id "lua" in fw.
-    keymapHelp.append(keymapHelp_t(ui->btn_luaReload->shortcut().toString(QKeySequence::NativeText), ui->btn_telemSim->statusTip()));
+    keymapHelp.append(keymapHelp_t(ui->btn_luaReload->shortcut().toString(QKeySequence::NativeText), ui->btn_luaReload->statusTip()));
   else
     ui->btn_luaReload->hide();
 
diff --git a/companion/src/simulation/simulatordialog.ui b/companion/src/simulation/simulatordialog.ui
index 022cb5f48..9b1d48e9c 100644
--- a/companion/src/simulation/simulatordialog.ui
+++ b/companion/src/simulation/simulatordialog.ui
@@ -259,7 +259,7 @@
         <string>Open the Joystick Settings window (F3)</string>
        </property>
        <property name="statusTip">
-        <string>Telemetry Simulator</string>
+        <string>Joystick Configuration</string>
        </property>
        <property name="text">
         <string>Joystick Config.</string>