diff --git a/src/blackgui/components/distributorpreferencescomponent.cpp b/src/blackgui/components/distributorpreferencescomponent.cpp
index baa750364..13a8e3a6b 100644
--- a/src/blackgui/components/distributorpreferencescomponent.cpp
+++ b/src/blackgui/components/distributorpreferencescomponent.cpp
@@ -32,6 +32,7 @@
 
 using namespace BlackMisc;
 using namespace BlackMisc::Simulation;
+using namespace BlackMisc::Network;
 using namespace BlackGui::Views;
 using namespace BlackGui::Models;
 
@@ -43,8 +44,11 @@ namespace BlackGui
             QFrame(parent),
             ui(new Ui::CDistributorPreferencesComponent)
         {
+            const CSimulatorInfo simulator = this->m_modelSetLoader.getSimulator();
+
             ui->setupUi(this);
             ui->comp_SimulatorSelector->setMode(CSimulatorSelector::RadioButtons);
+            ui->comp_SimulatorSelector->setValue(simulator);
 
             connect(ui->pb_All, &QPushButton::pressed, this, &CDistributorPreferencesComponent::ps_loadAll);
             connect(ui->pb_AllForSimulator, &QPushButton::pressed, this, &CDistributorPreferencesComponent::ps_loadAllForSimulator);
diff --git a/src/blackgui/components/distributorpreferencescomponent.h b/src/blackgui/components/distributorpreferencescomponent.h
index 4b561d8b7..c6e997a9b 100644
--- a/src/blackgui/components/distributorpreferencescomponent.h
+++ b/src/blackgui/components/distributorpreferencescomponent.h
@@ -69,11 +69,12 @@ namespace BlackGui
             void ps_deferredInit();
 
         private:
-            BlackGui::COverlayMessagesFrame *m_overlayMessageFrame = nullptr;
             QScopedPointer<Ui::CDistributorPreferencesComponent> ui;
+            BlackGui::COverlayMessagesFrame *m_overlayMessageFrame = nullptr;
             BlackMisc::Simulation::CAircraftModelSetLoader m_modelSetLoader { this };
             BlackMisc::CSetting<BlackCore::Settings::Simulation::DistributorListPreferences> m_distributorPreferences { this, &CDistributorPreferencesComponent::ps_preferencesChanged };
 
+            //! Update
             void updateContainerMaybeAsync(const BlackMisc::Simulation::CDistributorList &models, bool sortByOrder = true);
         };
     } // ns