diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp
index 1c2813622..0345efd25 100644
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/blackgui/components/textmessagecomponent.cpp
@@ -684,6 +684,12 @@ namespace BlackGui
             ui->lep_textMessages->setVisible(show);
         }
 
+        void CTextMessageComponent::focusTextEntry()
+        {
+            if (!ui->lep_textMessages->isVisible()) { return; }
+            ui->lep_textMessages->setFocus();
+        }
+
         void CTextMessageComponent::removeAllMessagesTab()
         {
             ui->tw_TextMessages->removeTab(0);
diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h
index 052e80f93..f377f884b 100644
--- a/src/blackgui/components/textmessagecomponent.h
+++ b/src/blackgui/components/textmessagecomponent.h
@@ -75,6 +75,9 @@ namespace BlackGui
             //! Show an text entry field
             void showTextMessageEntry(bool show);
 
+            //! Focus the text entry field
+            void focusTextEntry();
+
             //! Remove the all tab, the operation cannot be undone
             void removeAllMessagesTab();
 
diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp
index 220047982..0700b98b3 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/blackgui/overlaymessages.cpp
@@ -256,6 +256,7 @@ namespace BlackGui
         this->setHeader("Text message");
         this->showKill(false);
         this->display();
+        ui->comp_OverlayTextMessage->focusTextEntry();
     }
 
     void COverlayMessages::showOverlayImage(const CPixmap &image, int timeOutMs)