diff --git a/src/blackgui/components/dbownmodelscomponent.cpp b/src/blackgui/components/dbownmodelscomponent.cpp
index ceb573627..4617ceb1d 100644
--- a/src/blackgui/components/dbownmodelscomponent.cpp
+++ b/src/blackgui/components/dbownmodelscomponent.cpp
@@ -147,6 +147,11 @@ namespace BlackGui
             ui->tvp_OwnAircraftModels->setSimulatorForLoading(simulator);
         }
 
+        void CDbOwnModelsComponent::setSimulatorSelectorMode(CSimulatorSelector::Mode mode)
+        {
+            ui->comp_SimulatorSelector->setMode(mode);
+        }
+
         void CDbOwnModelsComponent::onSimulatorSelectorChanged()
         {
             const CSimulatorInfo simulator(ui->comp_SimulatorSelector->getValue());
diff --git a/src/blackgui/components/dbownmodelscomponent.h b/src/blackgui/components/dbownmodelscomponent.h
index 5fc9e050c..c1d6ee644 100644
--- a/src/blackgui/components/dbownmodelscomponent.h
+++ b/src/blackgui/components/dbownmodelscomponent.h
@@ -12,6 +12,7 @@
 #ifndef BLACKGUI_COMPONENTS_DBOWNMODELSCOMPONENT_H
 #define BLACKGUI_COMPONENTS_DBOWNMODELSCOMPONENT_H
 
+#include "blackgui/components/simulatorselector.h"
 #include "blackgui/menus/menudelegate.h"
 #include "blackgui/overlaymessagesframe.h"
 #include "blackmisc/datacache.h"
@@ -85,6 +86,9 @@ namespace BlackGui
             //! Change current simulator for own models
             void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);
 
+            //! \copydoc BlackGui::Components::CSimulatorSelector::setMode
+            void setSimulatorSelectorMode(CSimulatorSelector::Mode mode);
+
             //! Number of own models
             int getOwnModelsCount() const;
 
diff --git a/src/blackgui/components/dbownmodelscomponent.ui b/src/blackgui/components/dbownmodelscomponent.ui
index 7919c2325..3b10a8cb1 100644
--- a/src/blackgui/components/dbownmodelscomponent.ui
+++ b/src/blackgui/components/dbownmodelscomponent.ui
@@ -70,7 +70,7 @@
        <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="minimumSize">
          <size>
-          <width>200</width>
+          <width>50</width>
           <height>0</height>
          </size>
         </property>
diff --git a/src/blackgui/components/dbownmodelsdialog.cpp b/src/blackgui/components/dbownmodelsdialog.cpp
index f69968673..3836372d5 100644
--- a/src/blackgui/components/dbownmodelsdialog.cpp
+++ b/src/blackgui/components/dbownmodelsdialog.cpp
@@ -22,6 +22,7 @@ namespace BlackGui
             ui(new Ui::CDbOwnModelsDialog)
         {
             ui->setupUi(this);
+            ui->comp_OwnModels->setSimulatorSelectorMode(CSimulatorSelector::ComboBox);
             this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
             connect(ui->comp_OwnModels, &CDbOwnModelsComponent::successfullyLoadedModels, this, &CDbOwnModelsDialog::successfullyLoadedModels);
         }
diff --git a/src/blackgui/components/dbownmodelsetcomponent.cpp b/src/blackgui/components/dbownmodelsetcomponent.cpp
index d56c3c1fd..7a6c213af 100644
--- a/src/blackgui/components/dbownmodelsetcomponent.cpp
+++ b/src/blackgui/components/dbownmodelsetcomponent.cpp
@@ -403,6 +403,11 @@ namespace BlackGui
             this->updateViewToCurrentModels();
         }
 
+        void CDbOwnModelSetComponent::setSimulatorSelectorMode(CSimulatorSelector::Mode mode)
+        {
+            ui->comp_SimulatorSelector->setMode(mode);
+        }
+
         void CDbOwnModelSetComponent::triggerSetSimulatorDeferred(const CSimulatorInfo &simulator)
         {
             this->admitCache(simulator);
diff --git a/src/blackgui/components/dbownmodelsetcomponent.h b/src/blackgui/components/dbownmodelsetcomponent.h
index 655c13e8d..e42bc268d 100644
--- a/src/blackgui/components/dbownmodelsetcomponent.h
+++ b/src/blackgui/components/dbownmodelsetcomponent.h
@@ -13,6 +13,7 @@
 #define BLACKGUI_COMPONENTS_CDBOWNMODELSETCOMPONENT_H
 
 #include "blackgui/components/dbmappingcomponentaware.h"
+#include "blackgui/components/simulatorselector.h"
 #include "blackgui/menus/menudelegate.h"
 #include "blackmisc/simulation/data/modelcaches.h"
 #include "blackmisc/simulation/settings/modelsettings.h"
@@ -101,6 +102,9 @@ namespace BlackGui
             //! Simulator
             void setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);
 
+            //! \copydoc BlackGui::Components::CSimulatorSelector::setMode
+            void setSimulatorSelectorMode(CSimulatorSelector::Mode mode);
+
             //! Deferred init of simulator
             void triggerSetSimulatorDeferred(const BlackMisc::Simulation::CSimulatorInfo &simulator);
 
diff --git a/src/blackgui/components/dbownmodelsetcomponent.ui b/src/blackgui/components/dbownmodelsetcomponent.ui
index b4a6b7cb6..8ea486917 100644
--- a/src/blackgui/components/dbownmodelsetcomponent.ui
+++ b/src/blackgui/components/dbownmodelsetcomponent.ui
@@ -67,7 +67,7 @@
        <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
         <property name="minimumSize">
          <size>
-          <width>200</width>
+          <width>50</width>
           <height>0</height>
          </size>
         </property>
@@ -184,17 +184,17 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::Views::CAircraftModelView</class>
+   <extends>QTableView</extends>
+   <header>blackgui/views/aircraftmodelview.h</header>
+  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CSimulatorSelector</class>
    <extends>QFrame</extends>
    <header>blackgui/components/simulatorselector.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Views::CAircraftModelView</class>
-   <extends>QTableView</extends>
-   <header>blackgui/views/aircraftmodelview.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/src/blackgui/components/dbownmodelsetdialog.cpp b/src/blackgui/components/dbownmodelsetdialog.cpp
index 5c766acca..dccee03f9 100644
--- a/src/blackgui/components/dbownmodelsetdialog.cpp
+++ b/src/blackgui/components/dbownmodelsetdialog.cpp
@@ -21,6 +21,7 @@ namespace BlackGui
             ui(new Ui::CDbOwnModelSetDialog)
         {
             ui->setupUi(this);
+            ui->comp_OwnModelSet->setSimulatorSelectorMode(CSimulatorSelector::ComboBox);
             this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
         }