diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index b1a4b8007..16197f221 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -24,21 +24,7 @@
           <% end %>
         </div>
 
-        <% if @tag_filter || @search_terms %>
-          <div class="small-12 medium-5 margin-top inline-block debates-order">
-            <h6 class="inline-block">
-              <%= t("debates.index.select_order") %>
-            </h6>
-            <%= render 'shared/order_selector', i18n_namespace: "debates.index" %>
-          </div>
-        <% else %>
-          <div class="small-12 inline-block">
-            <h2 class="inline-block">
-              <%= t("debates.index.select_order_long") %>
-            </h2>
-            <%= render 'shared/order_selector', i18n_namespace: "debates.index" %>
-          </div>
-        <% end %>
+        <%= render 'shared/order_links', i18n_namespace: "debates.index" %>
 
         <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 77a0a79a0..6db5e3fc1 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -24,21 +24,7 @@
           <% end %>
         </div>
 
-        <% if @tag_filter || @search_terms %>
-          <div class="small-12 medium-5 margin-top margin-top inline-block proposals-order">
-            <h6 class="inline-block">
-              <%= t("proposals.index.select_order") %>
-            </h6>
-            <%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
-          </div>
-        <% else %>
-          <div class="small-12 inline-block">
-            <h2 class="inline-block">
-              <%= t("proposals.index.select_order_long") %>
-            </h2>
-            <%= render 'shared/order_selector', i18n_namespace: "proposals.index" %>
-          </div>
-        <% end %>
+        <%= render 'shared/order_links', i18n_namespace: "proposals.index" %>
 
         <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_links.html.erb b/app/views/shared/_order_links.html.erb
new file mode 100644
index 000000000..bea821859
--- /dev/null
+++ b/app/views/shared/_order_links.html.erb
@@ -0,0 +1,7 @@
+<section class="subnavigation row">
+  <% valid_orders.each do |order| %>
+    <%= link_to t("#{i18n_namespace}.orders.#{order}"),
+                current_path_with_query_params(order: order, page: 1),
+                class: order == @current_order ? 'active' : '' %>
+  <% end %>
+</section>