diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp
index 201f2f9c9..9df9c8c12 100644
--- a/Telegram/SourceFiles/chat_helpers/message_field.cpp
+++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp
@@ -125,6 +125,7 @@ MessageField::MessageField(QWidget *parent, not_null<Window::Controller*> contro
 		":shrug:",
 		QChar(175) + QString("\\_(") + QChar(12484) + ")_/" + QChar(175));
 	addInstantReplace(":o ", QString(1, QChar(0xD83D)) + QChar(0xDE28));
+	addInstantReplace("xD ", QString(1, QChar(0xD83D)) + QChar(0xDE06));
 	const auto &replacements = Ui::Emoji::internal::GetAllReplacements();
 	for (const auto &one : replacements) {
 		const auto with = Ui::Emoji::QStringFromUTF16(one.emoji);
diff --git a/Telegram/SourceFiles/codegen/emoji/data.cpp b/Telegram/SourceFiles/codegen/emoji/data.cpp
index e5407b58e..8b789e5de 100644
--- a/Telegram/SourceFiles/codegen/emoji/data.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/data.cpp
@@ -40,7 +40,7 @@ Replace Replaces[] = {
 //	{ { 0xD83DDE01U }, ":grin:" },
 //	{ { 0xD83DDE02U }, ":joy:" },
 	{ { 0xD83DDE1AU }, ":-*" },
-	{ { 0xD83DDE06U }, "xD" },
+//	{ { 0xD83DDE06U }, "xD" }, // Conflicts with typing xDDD...
 //	{ { 0xD83DDC4DU }, ":like:" },
 //	{ { 0xD83DDC4EU }, ":dislike:" },
 //	{ { 0x261DU }, ":up:" },