diff --git a/assets/javascripts/views/search/search.coffee b/assets/javascripts/views/search/search.coffee
index 4cdefd67..a37473a1 100644
--- a/assets/javascripts/views/search/search.coffee
+++ b/assets/javascripts/views/search/search.coffee
@@ -41,7 +41,8 @@ class app.views.Search extends app.View
     return
 
   autoFocus: =>
-    @focus() unless $.isTouchScreen()
+    unless $.isTouchScreen()
+      @input.focus() unless document.activeElement is @input
     return
 
   reset: ->