diff --git a/src/blackgui/components/atcstationcomponent.cpp b/src/blackgui/components/atcstationcomponent.cpp
index b05b911b1..9f52053e0 100644
--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -87,7 +87,8 @@ namespace BlackGui
             connect(ui->tb_AtcStationsLoadMetar, &QPushButton::clicked, this, &CAtcStationComponent::getMetarAsEntered);
             connect(ui->tb_Audio, &QPushButton::clicked, this, &CAtcStationComponent::requestAudioWidget);
             connect(this, &QTabWidget::currentChanged, this, &CAtcStationComponent::atcStationsTabChanged); // "local" tab changed (booked, online)
-            connect(ui->tvp_AtcStationsOnline, &QTableView::clicked, this, &CAtcStationComponent::onlineAtcStationSelected);
+            connect(ui->tvp_AtcStationsOnline, &CAtcStationView::objectClicked, this, &CAtcStationComponent::onlineAtcStationSelected);
+            connect(ui->tvp_AtcStationsOnline, &CAtcStationView::objectSelected, this, &CAtcStationComponent::onlineAtcStationSelected);
             connect(ui->tvp_AtcStationsOnline, &CAtcStationView::testRequestDummyAtcOnlineStations, this, &CAtcStationComponent::testCreateDummyOnlineAtcStations);
             connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestUpdate, this, &CAtcStationComponent::requestOnlineStationsUpdate);
             connect(ui->tvp_AtcStationsOnline, &CAtcStationView::requestNewBackendData, this, &CAtcStationComponent::requestOnlineStationsUpdate);
@@ -108,6 +109,10 @@ namespace BlackGui
             connect(sGui->getIContextNetwork(), &IContextNetwork::changedAtcStationOnlineConnectionStatus, this, &CAtcStationComponent::changedAtcStationOnlineConnectionStatus);
             connect(sGui->getIContextNetwork(), &IContextNetwork::connectionStatusChanged, this, &CAtcStationComponent::connectionStatusChanged);
 
+            // selection
+            ui->tvp_AtcStationsOnline->acceptClickSelection(true);
+            ui->tvp_AtcStationsOnline->acceptRowSelection(true);
+
             // web readers
             if (sGui->hasWebDataServices())
             {
@@ -122,6 +127,12 @@ namespace BlackGui
         CAtcStationComponent::~CAtcStationComponent()
         { }
 
+        void CAtcStationComponent::setTab(CAtcStationComponent::AtcTab tab)
+        {
+            const int t = static_cast<int>(tab);
+            this->setCurrentIndex(t);
+        }
+
         int CAtcStationComponent::countBookedStations() const
         {
             return ui->tvp_AtcStationsBooked->rowCount();
@@ -180,7 +191,7 @@ namespace BlackGui
 
                     ui->tvp_AtcStationsOnline->updateContainerMaybeAsync(onlineStations);
                     m_timestampLastReadOnlineStations = QDateTime::currentDateTimeUtc();
-                    m_timestampOnlineStationsChanged = m_timestampLastReadOnlineStations;
+                    m_timestampOnlineStationsChanged  = m_timestampLastReadOnlineStations;
                     this->updateTreeView();
                 }
             }
@@ -262,13 +273,13 @@ namespace BlackGui
         void CAtcStationComponent::connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
         {
             Q_UNUSED(from);
-            if (INetwork::isDisconnectedStatus(to))
+            if (INetwork::isConnectedStatus(to))
             {
                 ui->tvp_AtcStationsOnline->clear();
                 this->updateTreeView();
                 m_updateTimer.start();
             }
-            else if (INetwork::isConnectedStatus(to))
+            else if (INetwork::isDisconnectedStatus(to))
             {
                 m_updateTimer.stop();
             }
@@ -327,9 +338,21 @@ namespace BlackGui
 
         void CAtcStationComponent::settingsChanged()
         {
+            if (!this->canAccessContext()) { return; }
             const CViewUpdateSettings settings = m_settingsView.get();
             const int ms = settings.getAtcUpdateTime().toMs();
+            const bool connected = sGui->getIContextNetwork()->isConnected();
             m_updateTimer.setInterval(ms);
+            if (connected)
+            {
+                m_timestampOnlineStationsChanged = QDateTime::currentDateTimeUtc();
+                m_updateTimer.start(ms); // restart
+                this->update();
+            }
+            else
+            {
+                m_updateTimer.stop();
+            }
         }
 
         void CAtcStationComponent::airportsRead()
@@ -366,10 +389,11 @@ namespace BlackGui
             }
         }
 
-        void CAtcStationComponent::onlineAtcStationSelected(QModelIndex index)
+        void CAtcStationComponent::onlineAtcStationSelected(const CVariant &object)
         {
             ui->te_AtcStationsOnlineInfo->setText(""); // reset
-            const CAtcStation stationClicked = ui->tvp_AtcStationsOnline->derivedModel()->at(index);
+            if (!object.isValid() || !object.canConvert<CAtcStation>()) { return; }
+            const CAtcStation stationClicked = object.valueOrDefault(CAtcStation());
             QString infoMessage;
 
             if (stationClicked.hasAtis())
@@ -397,7 +421,7 @@ namespace BlackGui
 
         void CAtcStationComponent::requestAtis()
         {
-            if (!sGui->getIContextNetwork()->isConnected()) return;
+            if (!this->canAccessContext()) return;
             sGui->getIContextNetwork()->requestAtisUpdates();
         }
 
diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h
index f5c586d22..b30227657 100644
--- a/src/blackgui/components/atcstationcomponent.h
+++ b/src/blackgui/components/atcstationcomponent.h
@@ -47,12 +47,24 @@ namespace BlackGui
             Q_OBJECT
 
         public:
+            //! Tab
+            //! \remark needs to be in sync with tab order
+            enum AtcTab
+            {
+                TabAtcOnline = 0,
+                TabAtcOnlineTree,
+                TabAtcBooked
+            };
+
             //! Constructor
             explicit CAtcStationComponent(QWidget *parent = nullptr);
 
             //! Destructor
             virtual ~CAtcStationComponent() override;
 
+            //! Set tab
+            void setTab(AtcTab tab);
+
             //! Number of booked stations
             int countBookedStations() const;
 
@@ -86,7 +98,7 @@ namespace BlackGui
             void requestAtis();
 
             //! Online ATC station selected
-            void onlineAtcStationSelected(QModelIndex index);
+            void onlineAtcStationSelected(const BlackMisc::CVariant &object);
 
             //! Tab changed
             void atcStationsTabChanged();
@@ -140,7 +152,7 @@ namespace BlackGui
             QDateTime m_timestampLastReadBookedStations; //!< stations read
             QDateTime m_timestampBookedStationsChanged;  //!< stations marked as changed
             BlackMisc::CSettingReadOnly<BlackGui::Settings::TViewUpdateSettings>  m_settingsView { this, &CAtcStationComponent::settingsChanged };
-            BlackMisc::CSettingReadOnly<BlackGui::Settings::TAtcStationsSettings> m_settingsAtc { this, &CAtcStationComponent::settingsChanged };
+            BlackMisc::CSettingReadOnly<BlackGui::Settings::TAtcStationsSettings> m_settingsAtc  { this, &CAtcStationComponent::settingsChanged };
         };
     } // namespace
 } // namespace
diff --git a/src/blackgui/components/settingsatcstationsinlinecomponent.cpp b/src/blackgui/components/settingsatcstationsinlinecomponent.cpp
index 5785d94f3..bc6f0fd8e 100644
--- a/src/blackgui/components/settingsatcstationsinlinecomponent.cpp
+++ b/src/blackgui/components/settingsatcstationsinlinecomponent.cpp
@@ -21,7 +21,7 @@ namespace BlackGui
             ui(new Ui::CSettingsAtcStationsInlineComponent)
         {
             ui->setupUi(this);
-            connect(ui->rb_InRange, &QRadioButton::released, this, &CSettingsAtcStationsInlineComponent::changeSettings);
+            connect(ui->rb_InRange, &QRadioButton::toggled, this, &CSettingsAtcStationsInlineComponent::changeSettings);
         }
 
         CSettingsAtcStationsInlineComponent::~CSettingsAtcStationsInlineComponent()
diff --git a/src/blackgui/settings/atcstationssettings.h b/src/blackgui/settings/atcstationssettings.h
index 9d8cbdee2..f808f3fdd 100644
--- a/src/blackgui/settings/atcstationssettings.h
+++ b/src/blackgui/settings/atcstationssettings.h
@@ -21,8 +21,7 @@ namespace BlackGui
     namespace Settings
     {
         //! How to display ATC stations
-        class BLACKGUI_EXPORT CAtcStationsSettings :
-            public BlackMisc::CValueObject<CAtcStationsSettings>
+        class BLACKGUI_EXPORT CAtcStationsSettings : public BlackMisc::CValueObject<CAtcStationsSettings>
         {
         public:
             //! Properties by index