diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 951e2140eb4..d5579086a0e 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -136,20 +136,24 @@ export default Ember.Component.extend({
       this.appEvents.on(event, this, this._resetShouldBuildScrollMap);
     });
 
-    $input.on('touchstart mouseenter', () => {
-      if (!$preview.is(":visible")) return;
-      $preview.off('scroll');
+    Ember.run.schedule("afterRender", () => {
+      $input.scrollTop(0);
 
-      $input.on('scroll', () => {
-        this._syncScroll(this._syncEditorAndPreviewScroll, $input, $preview);
+      $input.on('touchstart mouseenter', () => {
+        if (!$preview.is(":visible")) return;
+        $preview.off('scroll');
+
+        $input.on('scroll', () => {
+          this._syncScroll(this._syncEditorAndPreviewScroll, $input, $preview);
+        });
       });
-    });
 
-    $preview.on('touchstart mouseenter', () => {
-      $input.off('scroll');
+      $preview.on('touchstart mouseenter', () => {
+        $input.off('scroll');
 
-      $preview.on('scroll', () => {
-        this._syncScroll(this._syncPreviewAndEditorScroll, $input, $preview);
+        $preview.on('scroll', () => {
+          this._syncScroll(this._syncPreviewAndEditorScroll, $input, $preview);
+        });
       });
     });
   },