diff --git a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
index 23380130..3bd51b51 100644
--- a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
+++ b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
@@ -79,6 +79,12 @@ void LobbyChat::playerChanged(QString oldNick, QString newNick)
 	QList<QTreeWidgetItem *> tmpList(myLobby->treeWidget_NickList->findItems(oldNick, Qt::MatchExactly));
 	if (!tmpList.empty())
 		tmpList.front()->setData(0, Qt::DisplayRole, newNick);
+	else
+	{
+		tmpList = myLobby->treeWidget_NickList->findItems("@" + oldNick, Qt::MatchExactly);
+		if (!tmpList.empty())
+			tmpList.front()->setData(0, Qt::DisplayRole, "@" + newNick);
+	}
 
 	if (myNick == oldNick)
 		myNick = newNick;