diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
index 972ec3729af..fb684b57d67 100644
--- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
@@ -18,9 +18,9 @@
     <div class='info'></div>
     <div class='tones'>
       {{#each skinTones as |skinTone|}}
-        <button class='tones-button {{skinTone.className}}' data-skin-tone="{{skinTone.level}}">
+        <a href='#' class='tones-button {{skinTone.className}}' data-skin-tone="{{skinTone.level}}">
           {{#if skinTone.selected}}{{fa-icon "check"}}{{/if}}
-        </button>
+        </a>
       {{/each}}
     </div>
     <div class='nav'>
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 7517044c898..10b1a6812b4 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -131,6 +131,7 @@ table.emoji-page td {
   display: flex;
   align-items: center;
   justify-content: center;
+  cursor: pointer;
 }
 .emoji-modal .tones-button.default { background: #ffcc4d; }
 .emoji-modal .tones-button.light { background: #f7dece; }