diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index 0d6b37dcc90..322959422f8 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -267,7 +267,7 @@ export default Ember.Component.extend({
     markdownOptions.siteSettings = this.siteSettings;
 
     this.set('preview', cook(value));
-    Ember.run.next(() => {
+    Ember.run.scheduleOnce('afterRender', () => {
       if (this._state !== "inDOM") { return; }
       const $preview = this.$('.d-editor-preview');
       if ($preview.length === 0) return;