1 files changed, 9 insertions, 3 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 5260d4153..add653cb0 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -250,14 +250,20 @@ impHandler(msg)
     {
         if (!chatWindow)
             return false;
-        chatWindow->addWhisper(recvnick, message, ChatMsgType::BY_PLAYER);
+        ChatTab *const tab = chatWindow->addChatTab(recvnick, false, true);
+        if (tab)
+        {
+            chatWindow->saveState();
+            tab->chatInput(message);
+        }
     }
     else
     {
         if (event.tab)
         {
-            // TRANSLATORS: whisper send
-            event.tab->chatLog(_("Cannot send empty whispers!"),
+            event.tab->chatLog(
+                // TRANSLATORS: whisper send
+                _("Cannot send empty whisper or channel message!"),
                 ChatMsgType::BY_SERVER);
         }
     }