diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index d099f8fd0..12dd4e684 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -1,7 +1,7 @@
 <section role="main">
 
   <div class="wrap row">
-    <div id="debates" class="debates-list small-12 medium-9 column js-order-<%= @current_order.dasherize %>">
+    <div id="debates" class="debates-list small-12 medium-9 column">
       <div class="filters">
         <div class="small-12 medium-7 column">
           <% if @search_terms %>
@@ -27,7 +27,7 @@
             <%= t("debates.index.select_order_long") %>
           </h2>
         <% end %>
-        <%= render 'shared/order_select', i18n_namespace: "debates.index" %>
+        <%= render 'shared/order_selector', i18n_namespace: "debates.index" %>
       </div>
       <div class="show-for-small-only">
         <%= link_to t("debates.index.start_debate"), new_debate_path, class: 'button radius expand' %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 963f41428..691b2ad58 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -1,7 +1,7 @@
 <section role="main">
 
   <div class="wrap row">
-    <div id="proposals" class="Proposals-list small-12 medium-9 column js-order-<%= @current_order.dasherize %>">
+    <div id="proposals" class="Proposals-list small-12 medium-9 column">
       <div class="filters">
         <div class="small-12 medium-7 column">
           <% if @search_terms %>
@@ -27,7 +27,7 @@
             <%= t("proposals.index.select_order_long") %>
           </h2>
         <% end %>
-        <%= render 'shared/order_select', i18n_namespace: "proposals.index" %>
+        <%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
       </div>
       <div class="show-for-small-only">
         <%= link_to t("proposals.index.start_proposal"), new_proposal_path, class: 'button radius expand' %>
diff --git a/app/views/shared/_order_select.html.erb b/app/views/shared/_order_selector.html.erb
similarity index 78%
rename from app/views/shared/_order_select.html.erb
rename to app/views/shared/_order_selector.html.erb
index de1576199..489977718 100644
--- a/app/views/shared/_order_select.html.erb
+++ b/app/views/shared/_order_selector.html.erb
@@ -4,7 +4,7 @@
 %>
 
 <form class="inline-block">
-   <select class="js-location-changer" name="order-selector">
+  <select class="js-location-changer js-order-selector" data-order="<%= @current_order %>" name="order-selector">
      <% @valid_orders.each do |order| %>
        <option <%= 'selected' if order == @current_order %>
                value='<%= current_path_with_query_params(order: order, page: 1) %>'>
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 84d7413e0..cc72a1b7d 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -378,7 +378,9 @@ feature 'Debates' do
       visit debates_path
       select 'most active', from: 'order-selector'
 
-      within '#debates.js-order-hot-score' do
+      expect(page).to have_selector('.js-order-selector[data-order="hot_score"]')
+
+      within '#debates' do
         expect('Best').to appear_before('Medium')
         expect('Medium').to appear_before('Worst')
       end
@@ -395,7 +397,9 @@ feature 'Debates' do
       visit debates_path
       select 'most commented', from: 'order-selector'
 
-      within '#debates.js-order-most-commented' do
+      expect(page).to have_selector('.js-order-selector[data-order="most_commented"]')
+
+      within '#debates' do
         expect('Best').to appear_before('Medium')
         expect('Medium').to appear_before('Worst')
       end
@@ -412,7 +416,9 @@ feature 'Debates' do
       visit debates_path
       select 'newest', from: 'order-selector'
 
-      within '#debates.js-order-created-at' do
+      expect(page).to have_selector('.js-order-selector[data-order="created_at"]')
+
+      within '#debates' do
         expect('Best').to appear_before('Medium')
         expect('Medium').to appear_before('Worst')
       end
@@ -426,13 +432,15 @@ feature 'Debates' do
       visit debates_path
 
       select 'random', from: 'order-selector'
-      debates_first_time = find("#debates.js-order-random").text
+      expect(page).to have_selector('.js-order-selector[data-order="random"]')
+      debates_first_time = find("#debates").text
 
       select 'most commented', from: 'order-selector'
-      expect(page).to have_selector('#debates.js-order-most-commented')
+      expect(page).to have_selector('.js-order-selector[data-order="most_commented"]')
 
       select 'random', from: 'order-selector'
-      debates_second_time = find("#debates.js-order-random").text
+      expect(page).to have_selector('.js-order-selector[data-order="random"]')
+      debates_second_time = find("#debates").text
 
       expect(debates_first_time).to_not eq(debates_second_time)
       expect(current_url).to include('page=1')
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 2db0d899f..85d0178f6 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -71,7 +71,9 @@ feature 'Proposals' do
       visit proposals_path
       select 'most active', from: 'order-selector'
 
-      within '#proposals.js-order-hot-score' do
+      expect(page).to have_selector('.js-order-selector[data-order="hot_score"]')
+
+      within '#proposals' do
         expect('Best Proposal').to appear_before('Medium Proposal')
         expect('Medium Proposal').to appear_before('Worst Proposal')
       end
@@ -88,7 +90,9 @@ feature 'Proposals' do
       visit proposals_path
       select 'most commented', from: 'order-selector'
 
-      within '#proposals.js-order-most-commented' do
+      expect(page).to have_selector('.js-order-selector[data-order="most_commented"]')
+
+      within '#proposals' do
         expect('Best Proposal').to appear_before('Medium Proposal')
         expect('Medium Proposal').to appear_before('Worst Proposal')
       end
@@ -105,7 +109,9 @@ feature 'Proposals' do
       visit proposals_path
       select 'newest', from: 'order-selector'
 
-      within '#proposals.js-order-created-at' do
+      expect(page).to have_selector('.js-order-selector[data-order="created_at"]')
+
+      within '#proposals' do
         expect('Best Proposal').to appear_before('Medium Proposal')
         expect('Medium Proposal').to appear_before('Worst Proposal')
       end
@@ -119,13 +125,15 @@ feature 'Proposals' do
       visit proposals_path
 
       select 'random', from: 'order-selector'
-      proposals_first_time = find("#proposals.js-order-random").text
+      expect(page).to have_selector('.js-order-selector[data-order="random"]')
+      proposals_first_time = find("#proposals").text
 
       select 'most commented', from: 'order-selector'
-      expect(page).to have_selector('#proposals.js-order-most-commented')
+      expect(page).to have_selector('.js-order-selector[data-order="most_commented"]')
 
       select 'random', from: 'order-selector'
-      proposals_second_time = find("#proposals.js-order-random").text
+      expect(page).to have_selector('.js-order-selector[data-order="random"]')
+      proposals_second_time = find("#proposals").text
 
       expect(proposals_first_time).to_not eq(proposals_second_time)
       expect(current_url).to include('page=1')