diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp
index aa3c358b3..dccd73cda 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -82,8 +82,9 @@ namespace BlackGui
             ui->tvp_AtcStationsOnline->setStationMode(CAtcStationListModel::StationsOnline);
             ui->tvp_AtcStationsBooked->setStationMode(CAtcStationListModel::StationsBooked);
 
-            // header
-            ui->tvp_AtcStationsOnlineTree->setHeaderHidden(true);
+            // menus
+            ui->tvp_AtcStationsOnline->menuRemoveItems(CAtcStationView::MenuClear);
+            ui->tvp_AtcStationsBooked->menuRemoveItems(CAtcStationView::MenuClear);
 
             // Signal / Slots
             connect(ui->le_AtcStationsOnlineMetar, &QLineEdit::returnPressed, this, &CAtcStationComponent::getMetarAsEntered);
@@ -99,6 +100,8 @@ namespace BlackGui
             connect(ui->tvp_AtcStationsOnline, &CAtcStationView::modelDataChangedDigest, this, &CAtcStationComponent::onCountChanged);
             connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestComFrequency, this, &CAtcStationComponent::setComFrequency);
             connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestTextMessageWidget, this, &CAtcStationComponent::requestTextMessageWidget);
+            connect(ui->tvp_AtcStationsOnlineTree, &CAtcStationTreeView::requestComFrequency, this, &CAtcStationComponent::setComFrequency);
+            connect(ui->tvp_AtcStationsOnlineTree, &CAtcStationTreeView::requestTextMessageWidget, this, &CAtcStationComponent::requestTextMessageWidget);
 
             connect(ui->comp_AtcStationsSettings, &CSettingsAtcStationsInlineComponent::changed, this, &CAtcStationComponent::forceUpdate, Qt::QueuedConnection);
 
diff --git a/src/blackgui/components/atcstationcomponent.ui b/src/blackgui/components/atcstationcomponent.ui
index a716015cb..1b5934d0a 100644
--- a/src/blackgui/components/atcstationcomponent.ui
+++ b/src/blackgui/components/atcstationcomponent.ui
@@ -187,9 +187,12 @@
      <number>0</number>
     </property>
     <item>
-     <widget class="QTreeView" name="tvp_AtcStationsOnlineTree">
+     <widget class="BlackGui::Views::CAtcStationTreeView" name="tvp_AtcStationsOnlineTree">
       <property name="selectionMode">
-       <enum>QAbstractItemView::NoSelection</enum>
+       <enum>QAbstractItemView::SingleSelection</enum>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
       </property>
       <property name="animated">
        <bool>true</bool>
@@ -267,6 +270,11 @@
    <header>blackgui/components/settingsatcstationsinlinecomponent.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::Views::CAtcStationTreeView</class>
+   <extends>QTreeView</extends>
+   <header>blackgui/views/atcstationtreeview.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tvp_AtcStationsOnline</tabstop>