diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6
index bb83304bcb..80dcc0ba21 100644
--- a/app/assets/javascripts/discourse/components/search-text-field.js.es6
+++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6
@@ -9,5 +9,9 @@ export default TextField.extend({
 
   focusIn: function() {
     Em.run.later(() => { this.$().select(); });
-  }
+  },
+
+  becomeFocused: function() {
+    if (this.get('hasAutofocus')) this.$().focus();
+  }.on('didInsertElement')
 });
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index 2e909601fb..f4fb1e787b 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -13,6 +13,11 @@ export default Ember.Controller.extend({
   context_id: null,
   context: null,
 
+  @computed('q')
+  hasAutofocus(q) {
+    return Em.isEmpty(q);
+  },
+
   @computed('skip_context', 'context')
   searchContextEnabled: {
     get(skip,context){
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 3b9bebb962..8f1874345c 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -1,5 +1,5 @@
 <div class="search row clearfix">
-  {{search-text-field value=searchTerm class="input-xxlarge search no-blur" action="search"}}
+  {{search-text-field value=searchTerm class="input-xxlarge search no-blur" action="search" hasAutofocus=hasAutofocus}}
   {{d-button action="search" icon="search" class="btn-primary" disabled=isNotValidSearchTerm}}
   {{#if canBulkSelect}}
     {{#if model.posts}}