diff --git a/CHANGES.md b/CHANGES.md
index 8a53063ad..592e6ee13 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,6 +2,8 @@
 
 ## 7.0.1 (Unreleased)
 
+- #2328: Honor `use_system_emojis` in emoji-picker
+
 ## 7.0.0 (2020-11-18)
 
 *Note for plugin authors:*
diff --git a/src/components/emoji-picker.js b/src/components/emoji-picker.js
index 4113cf1aa..32b3db31b 100644
--- a/src/components/emoji-picker.js
+++ b/src/components/emoji-picker.js
@@ -61,7 +61,7 @@ export default class EmojiPicker extends CustomElement {
             'query': this.query,
             'search_results': this.search_results,
             'render_emojis': this.render_emojis,
-            'sn2Emoji': shortname => u.shortnamesToEmojis(this.getTonedShortname(shortname))
+            'sn2Emoji': shortname => u.shortnamesToEmojis(this.getTonedShortname(shortname), {'add_title_wrapper': true})
         });
     }
 
diff --git a/src/templates/emoji_picker.js b/src/templates/emoji_picker.js
index 23446fda6..3283d6bcd 100644
--- a/src/templates/emoji_picker.js
+++ b/src/templates/emoji_picker.js
@@ -28,7 +28,7 @@ const emoji_picker_header = (o) => {
 const emoji_item = (o) => {
     return html`
         <li class="emoji insert-emoji ${o.shouldBeHidden(o.emoji.sn) ? 'hidden' : ''}" data-emoji="${o.emoji.sn}" title="${o.emoji.sn}">
-            <a href="#" @click=${o.insertEmoji} data-emoji="${o.emoji.sn}">${u.shortnamesToEmojis(o.emoji.sn)}</a>
+            <a href="#" @click=${o.insertEmoji} data-emoji="${o.emoji.sn}">${u.shortnamesToEmojis(o.emoji.sn, {'add_title_wrapper': true})}</a>
         </li>
     `;
 }
@@ -65,7 +65,7 @@ export const tpl_all_emojis = (o) => {
 const skintone_emoji = (o) => {
     return html`
         <li data-skintone="${o.skintone}" class="emoji-skintone ${(o.current_skintone === o.skintone) ? 'picked' : ''}">
-            <a class="pick-skintone" href="#" data-skintone="${o.skintone}" @click=${o.onSkintonePicked}>${u.shortnamesToEmojis(':'+o.skintone+':')}</a>
+            <a class="pick-skintone" href="#" data-skintone="${o.skintone}" @click=${o.onSkintonePicked}>${u.shortnamesToEmojis(':'+o.skintone+':', {'add_title_wrapper': true})}</a>
         </li>`;
 }