diff --git a/src/singletons/emotemanager.cpp b/src/singletons/emotemanager.cpp
index 8710d59ea..d9e575904 100644
--- a/src/singletons/emotemanager.cpp
+++ b/src/singletons/emotemanager.cpp
@@ -450,6 +450,10 @@ void EmoteManager::refreshTwitchEmotes(const std::shared_ptr<TwitchAccount> &use
                     std::string code = emoticon["code"].toString().toStdString();
                     emoteData.emoteSets[emoteSetString].push_back({id, code});
                     emoteData.emoteCodes.push_back(code);
+
+                    util::EmoteData emote = getTwitchEmoteById(emoticon["id"].toInt(),
+                                                               emoticon["code"].toString());
+                    emoteData.emotes.insert(emoticon["code"].toString(), emote);
                 }
             }
 
diff --git a/src/singletons/emotemanager.hpp b/src/singletons/emotemanager.hpp
index 97376f1aa..b714dfb9f 100644
--- a/src/singletons/emotemanager.hpp
+++ b/src/singletons/emotemanager.hpp
@@ -97,6 +97,8 @@ public:
 
         std::vector<std::string> emoteCodes;
 
+        util::EmoteMap emotes;
+
         bool filled = false;
     };
 
diff --git a/src/widgets/emotepopup.cpp b/src/widgets/emotepopup.cpp
index 81e2c7e2a..411e289eb 100644
--- a/src/widgets/emotepopup.cpp
+++ b/src/widgets/emotepopup.cpp
@@ -5,6 +5,7 @@
 
 #include "messages/messagebuilder.hpp"
 #include "providers/twitch/twitchchannel.hpp"
+#include "singletons/accountmanager.hpp"
 
 using namespace chatterino::providers::twitch;
 using namespace chatterino::messages;
@@ -76,6 +77,10 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
 
     singletons::EmoteManager &emoteManager = singletons::EmoteManager::getInstance();
 
+    QString userID = singletons::AccountManager::getInstance().Twitch.getCurrent()->getUserId();
+
+    addEmotes(emoteManager.twitchAccountEmotes[userID.toStdString()].emotes,
+              "Twitch Account Emotes", "Twitch Account Emote");
     addEmotes(emoteManager.bttvGlobalEmotes, "BetterTTV Global Emotes", "BetterTTV Global Emote");
     addEmotes(*channel->bttvChannelEmotes.get(), "BetterTTV Channel Emotes",
               "BetterTTV Channel Emote");