3 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index fa413452f..d080a6072 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -220,8 +220,9 @@ void EmoteShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 
     if (static_cast<unsigned>(index) < mEmoteImg.size() && mEmoteImg[index])
     {
+        const EmoteSprite *const sprite = mEmoteImg[index];
         mEmotePopup->show(viewport->getMouseX(), viewport->getMouseY(),
-                          mEmoteImg[index]->name);
+            strprintf("%s, %d", sprite->name.c_str(), sprite->id));
     }
 }
 
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 594bcce5d..97ea95aa0 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -49,6 +49,7 @@ void EmoteDB::load()
     unknownSprite->sprite = AnimatedSprite::load(
         paths.getStringValue("spriteErrorFile"));
     unknownSprite->name = "unknown";
+    unknownSprite->id = 0;
     mUnknown.sprites.push_back(unknownSprite);
 
     logger->log1("Initializing emote database...");
@@ -122,6 +123,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
                     XML::getProperty(spriteNode, "variant", 0));
                 currentSprite->name = XML::langProperty(
                     spriteNode, "name", "");
+                currentSprite->id = id;
                 currentInfo->sprites.push_back(currentSprite);
             }
             else if (xmlNameEqual(spriteNode, "particlefx"))
@@ -194,6 +196,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName)
                     XML::getProperty(spriteNode, "variant", 0));
                 currentSprite->name = XML::langProperty(
                     spriteNode, "name", "");
+                currentSprite->id = id;
                 currentInfo->sprites.push_back(currentSprite);
             }
             else if (xmlNameEqual(spriteNode, "particlefx"))
diff --git a/src/resources/db/emotedb.h b/src/resources/db/emotedb.h
index f00bfbb47..02683a99a 100644
--- a/src/resources/db/emotedb.h
+++ b/src/resources/db/emotedb.h
@@ -35,12 +35,14 @@ struct EmoteSprite final
 {
     EmoteSprite() :
         sprite(nullptr),
+        id(0),
         name()
     { }
 
     A_DELETE_COPY(EmoteSprite)
 
     const AnimatedSprite *sprite;
+    int id;
     std::string name;
 };