diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6
index 8099166d30..03a8369244 100644
--- a/app/assets/javascripts/discourse/components/composer-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6
@@ -59,7 +59,7 @@ export default Ember.Component.extend({
     $input.on('scroll', () => Ember.run.throttle(this, this._syncEditorAndPreviewScroll, 20));
 
     // Focus on the body unless we have a title
-    if (!this.get('composer.canEditTitle') && !Discourse.Mobile.mobileView) {
+    if (!this.get('composer.canEditTitle') && !this.capabilities.touch) {
       this.$('.d-editor-input').putCursorAtEnd();
     }
 
diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6
index e35ae8bfc1..6dc5f6e56b 100644
--- a/app/assets/javascripts/discourse/components/composer-title.js.es6
+++ b/app/assets/javascripts/discourse/components/composer-title.js.es6
@@ -4,7 +4,7 @@ export default Ember.Component.extend({
   classNames: ['title-input'],
 
   @on('didInsertElement')
-  _focusOnReply() {
+  _focusOnTitle() {
     if (!this.capabilities.touch) {
       this.$('input').putCursorAtEnd();
     }