diff --git a/plugins/solr/public/style.css b/plugins/solr/public/style.css
index 29acf83..b758010 100644
--- a/plugins/solr/public/style.css
+++ b/plugins/solr/public/style.css
@@ -4,11 +4,18 @@
 }
 
 #search-column-right .search-customize-options {
-  float: left;
-  margin-top: 23px;
-  margin-left: 0;
+  position: absolute;
+  margin: 0;
+  padding: 5px 0;
+  bottom: 0;
+  left: 0;
 }
 
 #search-column-right .search-results-box .vcard {
   margin: 4.5px 8px;
 }
+
+#search-column-right #search-actions {
+  position: relative;
+  height: 45px;
+}
diff --git a/plugins/solr/views/search/_facets_unselect_menu.rhtml b/plugins/solr/views/search/_facets_unselect_menu.rhtml
index db1393b..7777bf6 100644
--- a/plugins/solr/views/search/_facets_unselect_menu.rhtml
+++ b/plugins/solr/views/search/_facets_unselect_menu.rhtml
@@ -4,3 +4,4 @@
     <%= facet_selecteds_html_for(environment, asset_class(@asset), params) %>
   <% end %>
 </div>
+<div style="clear: both"></div>
diff --git a/plugins/solr/views/search/_results_header.html.erb b/plugins/solr/views/search/_results_header.html.erb
index 7d8f428..9340fef 100644
--- a/plugins/solr/views/search/_results_header.html.erb
+++ b/plugins/solr/views/search/_results_header.html.erb
@@ -9,14 +9,14 @@
       <% end %>
     </div>
 
-    <div class="search-results-header-facets-order-by">
-      <%= facets_unselect_menu(@asset) %>
-      <%= order_by(@asset) if params[:display] != 'map' %>
-    </div>
+    <%= facets_unselect_menu(@asset) %>
   <% else %>
     <div id='search-filter-title'><%= filter_title(@asset, @filter) %></div>
   <% end %>
-  <%= display_selector(@asset, params[:display]) %>
-  <%= filter_selector(@asset, @filter) if @empty_query && params[:display] != 'map' %>
+  <div id="search-actions">
+    <%= order_by(@asset) if params[:display] != 'map' && !@empty_query %>
+    <%= display_selector(@asset, params[:display]) %>
+    <%= filter_selector(@asset, @filter) if @empty_query && params[:display] != 'map' %>
+  </div>
   <div style="clear: both"></div>
 </div>
diff --git a/public/stylesheets/search.css b/public/stylesheets/search.css
index cdc53f7..7ce37f6 100644
--- a/public/stylesheets/search.css
+++ b/public/stylesheets/search.css
@@ -466,15 +466,14 @@ li.search-product-item {
   position: relative;
 }
 .facets-applied {
-  float: left;
   padding: 5px 0px 0px 0px;
-  width: 80%;
 }
 .facets-applied-label {
   display: block;
   font-size: 1em;
   font-style: italic;
   padding: 0 0 5px 0;
+  text-align: left;
 }
 .facet-selected {
   display: block;
@@ -683,7 +682,7 @@ li.search-product-item hr {
 .search-customize-options {
   display: inline-block;
   margin-left: 8px;
-  margin-top: 10px;
+  margin-top: 20px;
 }
 
 /* Search field and button */
--
libgit2 0.21.2