diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index a300cc280..55e612f17 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -229,7 +229,7 @@ $(document).ready(function () {
 
     page.load = function() {
       if (!("autofocus" in document.createElement("input"))) {
-        $(".search_form input[name=query]").focus();
+        $("#sidebar .search_form input[name=query]").focus();
       }
       return map.getState();
     };
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 55ce54219..732e57d31 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,7 +1,7 @@
 <%= form_tag search_path, :class => "search_form" do %>
   <%= submit_tag t('site.search.submit_text') %>
   <div class='query_wrapper'>
-    <input type="text" name="query" value="<%= params[:query] %>" placeholder="<%= t('site.search.search') %>" autofocus>
+    <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
     <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
   </div>
 <% end %>
diff --git a/app/views/layouts/map.html.erb b/app/views/layouts/map.html.erb
index ab2d0f77a..e72214cbe 100644
--- a/app/views/layouts/map.html.erb
+++ b/app/views/layouts/map.html.erb
@@ -16,9 +16,13 @@
   <% end %>
 <% end %>
 
+<% content_for :header do %>
+  <%= render :partial => "layouts/search", :locals => { :autofocus => false } %>
+<% end %>
+
 <% content_for :content do %>
   <div id="sidebar">
-    <%= render :partial => "layouts/search" %>
+    <%= render :partial => "layouts/search", :locals => { :autofocus => true } %>
 
     <% if STATUS == :database_offline or STATUS == :api_offline %>
       <p class="error"><%= t 'layouts.osm_offline' %></p>