diff --git a/src/blackgui/components/dbmappingcomponent.cpp b/src/blackgui/components/dbmappingcomponent.cpp
index d2ea80ca5..cd051231c 100644
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -73,6 +73,8 @@ namespace BlackGui
             connect(ui->tw_ModelsToBeMapped, &QTabWidget::currentChanged, this, &CDbMappingComponent::ps_tabIndexChanged);
             connect(ui->tw_ModelsToBeMapped, &QTabWidget::currentChanged, ui->comp_ModelMatcher , &CModelMatcherComponent::tabIndexChanged);
 
+            connect(ui->comp_OwnModelSet->view(), &CAircraftModelView::doubleClicked, this, &CDbMappingComponent::ps_onModelRowSelected);
+
             // how to display forms
             ui->editor_AircraftIcao->setSelectOnly();
             ui->editor_Distributor->setSelectOnly();
@@ -82,6 +84,10 @@ namespace BlackGui
             this->ui->tw_ModelsToBeMapped->setTabIcon(TabOwnModels, CIcons::appModels16());
             this->ui->comp_StashAircraft->view()->setCustomMenu(new CApplyDbDataMenu(this));
 
+            // custom menu
+            this->setContextMenuPolicy(Qt::CustomContextMenu);
+            connect(this, &CDbMappingComponent::customContextMenuRequested, this, &CDbMappingComponent::ps_onCustomContextMenu);
+
             // vPilot
             this->initVPilotLoading();
         }
@@ -137,6 +143,8 @@ namespace BlackGui
         {
             if (!index.isValid()) { return CAircraftModel(); }
             const QObject *sender = QObject::sender();
+
+            // check if we have an explicit sender
             if (sender == this->ui->tvp_AircraftModelsForVPilot)
             {
                 return this->ui->tvp_AircraftModelsForVPilot->at(index);
@@ -149,6 +157,10 @@ namespace BlackGui
             {
                 return this->ui->comp_StashAircraft->view()->at(index);
             }
+            else if (sender == this->ui->comp_OwnModelSet->view())
+            {
+                return this->ui->comp_OwnModelSet->view()->at(index);
+            }
 
             // no sender, use current tab
             const CAircraftModelView *v = this->currentModelView();
diff --git a/src/blackgui/components/dbmappingcomponent.ui b/src/blackgui/components/dbmappingcomponent.ui
index 50d364582..1804c367f 100644
--- a/src/blackgui/components/dbmappingcomponent.ui
+++ b/src/blackgui/components/dbmappingcomponent.ui
@@ -37,6 +37,12 @@
    </property>
    <item>
     <widget class="QSplitter" name="sp_MappingComponent">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>