diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.cpp b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
index 46c70a787..3473c5e80 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.cpp
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.cpp
@@ -51,6 +51,7 @@ namespace BlackGui
             connect(ui->pb_AdjustModelDirectory, &QPushButton::clicked, this, &CSettingsSimulatorBasicsComponent::adjustModelDirectory);
             connect(ui->le_SimulatorDirectory, &QLineEdit::returnPressed, this, &CSettingsSimulatorBasicsComponent::simulatorDirectoryEntered);
             connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CSettingsSimulatorBasicsComponent::onSimulatorChanged);
+            connect(&m_settings, &CMultiSimulatorSettings::settingsChanged, this, &CSettingsSimulatorBasicsComponent::onSimulatorSettingsChanged);
 
             this->onSimulatorChanged();
         }
@@ -178,6 +179,15 @@ namespace BlackGui
             this->displayDefaultValuesAsPlaceholder(simulator);
         }
 
+        void CSettingsSimulatorBasicsComponent::onSimulatorSettingsChanged(const CSimulatorInfo &simulator)
+        {
+            const CSimulatorInfo selectedSimulator(ui->comp_SimulatorSelector->getValue());
+            if (selectedSimulator == simulator)
+            {
+                this->displaySettings(simulator);
+            }
+        }
+
         QStringList CSettingsSimulatorBasicsComponent::parseModelDirectories() const
         {
             return this->parseDirectories(ui->pte_ModelDirectories->toPlainText());
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.h b/src/blackgui/components/settingssimulatorbasicscomponent.h
index c012cf661..dbdc97881 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.h
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.h
@@ -84,6 +84,9 @@ namespace BlackGui
             //! Simulator has been changed
             void onSimulatorChanged();
 
+            //! Simulator settings did change
+            void onSimulatorSettingsChanged(const BlackMisc::Simulation::CSimulatorInfo &simulator);
+
             //! Optimize for small layout
             void setSmallLayout(bool small);