diff --git a/app/views/search/_search_form.rhtml b/app/views/search/_search_form.rhtml
index d611bb3..b8b95cd 100644
--- a/app/views/search/_search_form.rhtml
+++ b/app/views/search/_search_form.rhtml
@@ -11,7 +11,8 @@
   <div class="search-field">
     <span class="formfield">
       <%= text_field_tag 'query', @query, :id => ( lightbox? ? 'popup-search-input' : '' ), :size => 50 %>
-      <%= javascript_tag '$("popup-search-input").focus()' if lightbox? %>
+      <%# javascript_tag 'alert(123); alert( $("popup-search-input") )' if lightbox? %>
+      <%= javascript_tag 'setTimeout( $("popup-search-input").focus(), 10 )' if lightbox? %>
     </span>
     <%= submit_button(:search, _('Search'), :name => :search_whole_site_no) %>
     <% if @category %>
@@ -24,8 +25,15 @@
       <h4><%= _('Search within:') %></h4>
       <br style='clear:left'/>
       <div>
-        <label for="search-radius"><%= _('Distance (km): ') %></label><%= text_field_tag 'radius', '',:id => 'search-radius' %>
-        <label for="search_region"><%= _('From: ') %></label><%= text_field :region, :name, :id => 'search_region' %>
+        <span class="formfield">
+          <label for="search-radius"><%= _('Distance (km):') %></label>
+          <%= text_field_tag 'radius', '', :id => 'search-radius', :size => 3 %>
+        </span>
+        &nbsp;
+        <span class="formfield">
+          <label for="search_region"><%= _('From:') %></label>
+          <%= text_field :region, :name, :id => 'search_region', :size => 30 %>
+        </span>
         <div id='search_region_auto_complete' class='auto-complete'></div>
         <%= auto_complete_field('search_region', :url => {:action => 'complete_region'}) %>
       </div>
--
libgit2 0.21.2