diff --git a/src/blackgui/components/commandinput.cpp b/src/blackgui/components/commandinput.cpp
index ab8642c1a..ae6f6b112 100644
--- a/src/blackgui/components/commandinput.cpp
+++ b/src/blackgui/components/commandinput.cpp
@@ -49,7 +49,7 @@ namespace BlackGui
                     connect(sGui->getIContextNetwork(), &IContextNetwork::connectedServerChanged, this, &CCommandInput::onConnectedServerChanged, Qt::QueuedConnection);
                 }
             }
-            connect(this, &CCommandInput::returnPressed, this, &CCommandInput::validateCommand);
+            connect(this, &CCommandInput::returnPressedUnemptyLine, this, &CCommandInput::validateCommand, Qt::QueuedConnection);
         }
 
         void CCommandInput::showToolTip(bool show)
@@ -64,7 +64,7 @@ namespace BlackGui
             if (c.isEmpty()) { return; }
             if (c.startsWith('.'))
             {
-                if (c.contains("help", Qt::CaseInsensitive))    { this->setCommandToolTip(); return; }
+                if (c.contains("help",    Qt::CaseInsensitive)) { this->setCommandToolTip(); return; }
                 if (c.contains("tooltip", Qt::CaseInsensitive)) { this->showToolTip(!m_showToolTip); return; }
                 emit this->commandEntered(c, this->identifier());
             }
diff --git a/src/blackgui/components/textmessagecomponent.cpp b/src/blackgui/components/textmessagecomponent.cpp
index 3679f29c7..123c75e52 100644
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/blackgui/components/textmessagecomponent.cpp
@@ -69,14 +69,14 @@ namespace BlackGui
             ui->comp_AtcStations->setWithIcons(false);
 
             // lep_textMessages is the own line edit
-            bool c = connect(ui->lep_textMessages, &CLineEditHistory::returnPressed, this, &CTextMessageComponent::textMessageEntered);
+            bool c = connect(ui->lep_textMessages, &CLineEditHistory::returnPressedUnemptyLine, this, &CTextMessageComponent::textMessageEntered, Qt::QueuedConnection);
             Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
-            c = connect(ui->gb_Settings, &QGroupBox::toggled, this, &CTextMessageComponent::onSettingsChecked);
+            c = connect(ui->gb_Settings, &QGroupBox::toggled, this, &CTextMessageComponent::onSettingsChecked, Qt::QueuedConnection);
             Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
-            c = connect(ui->gb_MessageTo, &QGroupBox::toggled, this, &CTextMessageComponent::onMessageToChecked);
+            c = connect(ui->gb_MessageTo, &QGroupBox::toggled, this, &CTextMessageComponent::onMessageToChecked, Qt::QueuedConnection);
             Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
 
-            c = connect(ui->comp_AtcStations, &CAtcButtonComponent::requestAtcStation, this, &CTextMessageComponent::onAtcButtonClicked);
+            c = connect(ui->comp_AtcStations, &CAtcButtonComponent::requestAtcStation, this, &CTextMessageComponent::onAtcButtonClicked, Qt::QueuedConnection);
             Q_ASSERT_X(c, Q_FUNC_INFO, "Missing connect");
 
             // style sheet
diff --git a/src/blackgui/lineedithistory.cpp b/src/blackgui/lineedithistory.cpp
index a76755e20..6c2fea724 100644
--- a/src/blackgui/lineedithistory.cpp
+++ b/src/blackgui/lineedithistory.cpp
@@ -30,15 +30,18 @@ namespace BlackGui
 
     void CLineEditHistory::keyPressEvent(QKeyEvent *event)
     {
-        if (event->key() == Qt::Key_Up)
+        const int key = event->key();
+        bool nonEmpty = false;
+
+        if (key == Qt::Key_Up)
         {
             // move back in history
             if (m_history.size() > m_position)
             {
-                setText(m_history.at(m_position++));
+                this->setText(m_history.at(m_position++));
             }
         }
-        else if (event->key() == Qt::Key_Down)
+        else if (key == Qt::Key_Down)
         {
             // move forward in history
             if (m_position <= 0) { this->clear(); return; }
@@ -48,17 +51,22 @@ namespace BlackGui
                 this->setText(m_history.at(m_position));
             }
         }
-        else if (event->key() == Qt::Key_Return)
+        else if (key == Qt::Key_Return || key == Qt::Key_Enter) // normal and keypad enter
         {
-            if (!text().isEmpty())
+            const QString t = this->text().trimmed();
+            if (!t.isEmpty())
             {
-                m_history.push_front(text());
+                m_history.push_front(t);
                 m_position = 0;
                 this->clear();
+                nonEmpty = true;
             }
         }
         // default handler for event
         QLineEdit::keyPressEvent(event);
+
+        // signal
+        if (nonEmpty) { emit this->returnPressedUnemptyLine(); }
     }
 
     void CLineEditHistory::contextMenuEvent(QContextMenuEvent *event)
diff --git a/src/blackgui/lineedithistory.h b/src/blackgui/lineedithistory.h
index b58bfa154..dfccd9592 100644
--- a/src/blackgui/lineedithistory.h
+++ b/src/blackgui/lineedithistory.h
@@ -19,6 +19,7 @@ namespace BlackGui
 {
     /*!
      * Line edit with history
+     * \details lines are trimmed and empty lines are ignored
      */
     class BLACKGUI_EXPORT CLineEditHistory : public QLineEdit
     {
@@ -37,6 +38,11 @@ namespace BlackGui
         //! Clear the history
         void clearHistory();
 
+    signals:
+        //! Return has been pressed, line is NOT empty (spaces are trimmed)
+        //! \details returnPressed alsofires on empty lines, but those are not in the history
+        void returnPressedUnemptyLine();
+
     protected:
         //! \copydoc QLineEdit::keyPressEvent
         virtual void keyPressEvent(QKeyEvent *event) override;