2 files changed, 8 insertions, 3 deletions
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index d42583f62..ffe347099 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -491,7 +491,7 @@ void ShopWindow::announce(ShopItems *const list, const int mode)
         }
     }
 
-    Net::getChatHandler()->talk(data);
+    Net::getChatHandler()->talk(data, GENERAL_CHANNEL);
 }
 
 void ShopWindow::giveList(const std::string &nick, const int mode)
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 2b360789a..f219bb661 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -412,9 +412,14 @@ void ChatTab::clearText()
 void ChatTab::handleInput(const std::string &msg)
 {
     if (chatWindow)
-        Net::getChatHandler()->talk(chatWindow->doReplace(msg));
+    {
+        Net::getChatHandler()->talk(chatWindow->doReplace(msg),
+            mChannelName);
+    }
     else
-        Net::getChatHandler()->talk(msg);
+    {
+        Net::getChatHandler()->talk(msg, mChannelName);
+    }
 }
 
 void ChatTab::handleCommand(const std::string &msg)