diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index efe81cdb9e..be2b1df3d5 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -144,14 +144,6 @@ export default Ember.Component.extend({
         $input.on('scroll', () => {
           this._syncScroll(this._syncEditorAndPreviewScroll, $input, $preview);
         });
-
-        $input.on('keypress', () => {
-          Ember.run.debounce(
-            this,
-            this._syncScroll, this._syncEditorAndPreviewScroll, $input, $preview,
-            200
-          );
-        });
       });
 
       $preview.on('touchstart mouseenter', () => {
@@ -727,6 +719,7 @@ export default Ember.Component.extend({
         Ember.run.debounce(this, this._loadInlineOneboxes, inline, 450);
       }
 
+      this._syncScroll(this._syncEditorAndPreviewScroll, this.$('.d-editor-input'), $preview);
       this.trigger('previewRefreshed', $preview);
       this.sendAction('afterRefresh', $preview);
     },
diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index bf6dcecd21..3c7f581375 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -11,7 +11,8 @@
            validation=validation
            loading=composer.loading
            forcePreview=forcePreview
-           composerEvents=true}}
+           composerEvents=true
+           autofocus=true}}
 
 {{#if site.mobileView}}
     <input type="file" id="mobile-uploader" multiple />