diff --git a/dist/converse.js b/dist/converse.js
index b5492d71c..897b3ae87 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -93742,6 +93742,8 @@ __p += ' hidden ';
  }; ;
 __p += '"\n            data-emoji="' +
 __e(emoji._shortname) +
+'" title="' +
+__e(emoji._shortname) +
 '">\n                <a href="#" data-emoji="' +
 __e(emoji._shortname) +
 '"> ' +
diff --git a/src/templates/emojis.html b/src/templates/emojis.html
index 63d1a9e43..dae8c77cd 100644
--- a/src/templates/emojis.html
+++ b/src/templates/emojis.html
@@ -3,7 +3,7 @@
     <ul class="emoji-picker emoji-picker-{{{category}}} {[ if (o.current_category !== category) { ]} hidden {[ } ]}">
         {[ o._.forEach(o.emojis_by_category[category], function (emoji) { ]}
         <li class="emoji insert-emoji {[ if (o.shouldBeHidden(emoji._shortname, o.current_skintone, o.toned_emojis)) { ]} hidden {[ }; ]}"
-            data-emoji="{{{emoji._shortname}}}">
+            data-emoji="{{{emoji._shortname}}}" title="{{{emoji._shortname}}}">
                 <a href="#" data-emoji="{{{emoji._shortname}}}"> {{ o.transform(emoji._shortname) }}  </a>
         </li>
         {[ }); ]}