diff --git a/src/blackgui/components/atcbuttoncomponent.cpp b/src/blackgui/components/atcbuttoncomponent.cpp
index d04bf0765..abf33aa2b 100644
--- a/src/blackgui/components/atcbuttoncomponent.cpp
+++ b/src/blackgui/components/atcbuttoncomponent.cpp
@@ -113,6 +113,7 @@ namespace BlackGui
         void CAtcButtonComponent::onChangedAtcStations()
         {
             if (!m_backgroundUpdates) { return; }
+            if (!this->isVisible())   { return; }
             this->updateStations();
         }
 
diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp
index e3c193ffb..ae4b75be8 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/blackgui/overlaymessages.cpp
@@ -268,6 +268,7 @@ namespace BlackGui
     {
         ui->comp_OverlayTextMessage->setTab(tab);
         ui->comp_OverlayTextMessage->updateAtcStationsButtons();
+        ui->comp_OverlayTextMessage->showTextMessageEntry(true);
         this->setModeToOverlayTextMessage();
         this->display();
         ui->comp_OverlayTextMessage->focusTextEntry();