diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index 21f4ba19b20..378e83fd0e1 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -115,21 +115,13 @@ export default Ember.Component.extend({
 
     this._bindEvents();
 
-    this._later(this, function() {
+    Ember.run.scheduleOnce('afterRender', this, function() {
       this._setDiversity();
       this._positionPicker();
       this._scrollTo();
     });
   },
 
-  _later(context, handler, timeout) {
-    if(Ember.testing) {
-      handler.bind(context)();
-    } else {
-      Ember.run.later(context, handler, timeout);
-    }
-  },
-
   _bindEvents() {
     this._bindDiversityClick();
     this._bindSectionsScroll();
@@ -322,7 +314,7 @@ export default Ember.Component.extend({
       if(preloadedSection && !preloadedSection.$section.hasClass("loaded")) {
         preloadedSection.$section.addClass("loaded");
         const $visibleEmojis = preloadedSection.$section.find(".emoji[src='']");
-        this._later(this, function() { this._loadVisibleEmojis($visibleEmojis); }, 1500);
+        Ember.run.later(this, () => this._loadVisibleEmojis($visibleEmojis), 1500);
       }
     }
   },