diff --git a/src/components/emoticonsDropdown/tabs/emoji.ts b/src/components/emoticonsDropdown/tabs/emoji.ts
index 5532334e..719b6a54 100644
--- a/src/components/emoticonsDropdown/tabs/emoji.ts
+++ b/src/components/emoticonsDropdown/tabs/emoji.ts
@@ -244,7 +244,7 @@ export default class EmojiTab implements EmoticonsTab {
       const children = Array.from(this.recentItemsDiv.children) as HTMLElement[];
       for(let i = 0, length = children.length; i < length; ++i) {
         const el = children[i];
-        const _emoji = getEmojiFromElement(el);
+        const _emoji = RichTextProcessor.fixEmoji(getEmojiFromElement(el));
         if(emoji === _emoji) {
           if(i === 0) {
             return;
diff --git a/src/lib/appManagers/appEmojiManager.ts b/src/lib/appManagers/appEmojiManager.ts
index de5a9a6a..a263bc0e 100644
--- a/src/lib/appManagers/appEmojiManager.ts
+++ b/src/lib/appManagers/appEmojiManager.ts
@@ -10,6 +10,7 @@ import { validateInitObject } from "../../helpers/object";
 import I18n from "../langPack";
 import { isObject } from "../mtproto/bin_utils";
 import apiManager from "../mtproto/mtprotoworker";
+import RichTextProcessor from "../richtextprocessor";
 import rootScope from "../rootScope";
 import SearchIndex from "../searchIndex";
 import stateStorage from "../stateStorage";
@@ -219,6 +220,7 @@ export class AppEmojiManager {
   }
 
   public pushRecentEmoji(emoji: string) {
+    emoji = RichTextProcessor.fixEmoji(emoji);
     this.getRecentEmojis().then(recent => {
       recent.findAndSplice(e => e === emoji);
       recent.unshift(emoji);