diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 74ec05823..638be0dca 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -349,15 +349,15 @@ $(document).ready(function () {
 
   $(".get_directions").on("click",function(e) {
 	e.preventDefault();
-	$(".query_wrapper.search").hide();
-	$(".query_wrapper.routing").show();
+	$(".search").hide();
+	$(".routing").show();
 	$(".query_wrapper.routing [name=route_from]").focus();
   });
 
   $(".close_directions").on("click",function(e) {
 	e.preventDefault();
-	$(".query_wrapper.search").show();
-	$(".query_wrapper.routing").hide();
+	$(".search").show();
+	$(".routing").hide();
 	$(".query_wrapper.search [name=query]").focus();
   });
 
diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 93b8f0d07..6e402f3b8 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -916,6 +916,7 @@ header .search_form {
 .search_form {
   position: relative;
   padding: $lineheight/2;
+  padding-top: 1px;
   background-color: $lightgrey;
 
   .query_wrapper {
@@ -946,15 +947,13 @@ header .search_form {
     border-radius: 0 2px 2px 0;
   }
 
-  .describe_location {
-    position: absolute;
-    top: 6px;
-    right: 6px;
+  .query_options {
+    text-align: right;
     font-size: 10px;
     color: $blue;
   }
 
-  .query_wrapper.routing {
+  .routing {
     display: none;
   }
 }
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index acc910b48..247798bf2 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,22 +1,23 @@
 <%= form_tag search_path, :class => "search_form" do %>
+  <div class='query_options search'>
+    <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
+    &middot;
+    <%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %>
+  </div>
+  <div class='query_options routing'>
+    <%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %>
+  </div>
+
   <%= submit_tag t('site.search.submit_text') %>
 
   <div class='query_wrapper search'>
     <%= text_field_tag "query", params[:query], :placeholder => t("site.search.search"), :autofocus => autofocus %>
-    <div class='query_options'>
-      <%= link_to t('site.search.get_directions'), '#', { :class => "get_directions", :title => t('site.search.get_directions_title') } %>
-      &middot;
-      <%= link_to t('site.search.where_am_i'), '#', { :class => "describe_location", :title => t('site.search.where_am_i_title') } %>
-    </div>
   </div>
 
   <div class='query_wrapper routing'>
     <%= text_field_tag "route_from", params[:from], :placeholder => "From", :onchange=>"OSM.routing.geocode('route_from',event)" %>
     <%= text_field_tag "route_to"  , params[:to]  , :placeholder => "To"  , :onchange=>"OSM.routing.geocode('route_to'  ,event)" %>
-    <div class='query_options'>
-      <select class='routing_engines'></select>
-      <%= link_to t('site.search.close_directions'), '#', { :class => "close_directions", :title => t('site.search.close_directions_title') } %>
-    </div>
+    <select class='routing_engines'></select>
   </div>
 
 <% end %>