diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 9ca4f4eaa86..83b7d2abc5f 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -266,7 +266,7 @@ export default Ember.Component.extend({
           $this.on('touchmove', () => $this.off('touchend') );
         });
     } else {
-      $emojisContainer.on("click", "a", e => handler.bind(this)(e) );
+      $emojisContainer.off("click").on("click", "a", e => handler.bind(this)(e) );
     }
   },