diff --git a/app/assets/stylesheets/community.scss b/app/assets/stylesheets/community.scss
index c06d5c5d2..41e40994d 100644
--- a/app/assets/stylesheets/community.scss
+++ b/app/assets/stylesheets/community.scss
@@ -4,10 +4,6 @@
     pointer-events: none;
   }
 
-  .wide-order-selector {
-    margin-top: 0;
-  }
-
   .panel {
     min-height: auto;
     margin: 0.375rem 0;
diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 88ab4e31c..25f7f641e 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -1856,6 +1856,11 @@ table {
     }
   }
 
+  .order-links {
+    margin-bottom: $line-height;
+    margin-top: $line-height;
+  }
+
   .comment {
     line-height: $list-lineheight;
     margin: $line-height / 4 0;
diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 7257f9940..5c48631ec 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -393,6 +393,11 @@
       font-size: rem-calc(15);
       margin-bottom: rem-calc(15);
     }
+
+    .order-links > li {
+      font-size: inherit;
+      margin-bottom: 0;
+    }
   }
 
   .geozone {
diff --git a/app/components/shared/comments_component.html.erb b/app/components/shared/comments_component.html.erb
index b6b12f691..cb29bf459 100644
--- a/app/components/shared/comments_component.html.erb
+++ b/app/components/shared/comments_component.html.erb
@@ -3,15 +3,13 @@
     <div id="comments" class="small-12 column">
       <%= content %>
 
-      <%= render "shared/wide_order_selector", i18n_namespace: "comments" %>
-
       <% if current_user %>
         <%= render "comments/form", { commentable: record, parent_id: nil } %>
       <% else %>
-        <br>
         <%= render "shared/login_to_comment" %>
       <% end %>
 
+      <%= render "shared/order_links", i18n_namespace: "comments" %>
       <%= render "comments/comment_list", comments: comment_tree.root_comments %>
       <%= paginate comment_tree.root_comments %>
     </div>
diff --git a/app/views/comments/_comment_tree.html.erb b/app/views/comments/_comment_tree.html.erb
index c8014178c..3d058eed2 100644
--- a/app/views/comments/_comment_tree.html.erb
+++ b/app/views/comments/_comment_tree.html.erb
@@ -11,8 +11,6 @@
           </h2>
         <% end %>
 
-        <%= render "shared/wide_order_selector", i18n_namespace: "comments" %>
-
         <% if user_signed_in? %>
           <% if comments_closed_for_commentable?(commentable) %>
             <br>
@@ -30,10 +28,10 @@
                                           valuation: valuation } %>
           <% end %>
         <% else %>
-          <br>
           <%= render "shared/login_to_comment" %>
         <% end %>
 
+        <%= render "shared/order_links", i18n_namespace: "comments" %>
         <%= render "comments/comment_list", comments: comment_tree.root_comments, valuation: valuation %>
         <%= paginate comment_tree.root_comments %>
       </div>
diff --git a/app/views/shared/_order_links.html.erb b/app/views/shared/_order_links.html.erb
index 5bdcdfd56..5266a566c 100644
--- a/app/views/shared/_order_links.html.erb
+++ b/app/views/shared/_order_links.html.erb
@@ -1,4 +1,4 @@
-<ul class="no-bullet submenu">
+<ul class="no-bullet submenu order-links">
   <% @valid_orders.each do |order| %>
     <li class="inline-block">
       <%= link_to current_path_with_query_params(order: order, page: 1), class: order == @current_order ? "is-active" : "" do %>
diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb
index 2067da7b8..3375ab103 100644
--- a/app/views/topics/_topics.html.erb
+++ b/app/views/topics/_topics.html.erb
@@ -1,7 +1,7 @@
 <% if topics.any? %>
   <div class="row column">
     <div class="order">
-      <%= render "shared/wide_order_selector", i18n_namespace: "comments" %>
+      <%= render "shared/order_links", i18n_namespace: "comments" %>
     </div>
   </div>
 <% else %>
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 83a671085..5c45f5300 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -61,7 +61,6 @@ en:
       newest: Newest first
       oldest: Oldest first
       most_commented: Most commented
-    select_order: Sort by
     show:
       return_to_commentable: "Go back to "
   comments_helper:
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 3386c5f97..dec72880e 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -61,7 +61,6 @@ es:
       newest: Más nuevos primero
       oldest: Más antiguos primero
       most_commented: Más comentados
-    select_order: Ordenar por
     show:
       return_to_commentable: "Volver a "
   comments_helper:
diff --git a/spec/system/comments/budget_investments_spec.rb b/spec/system/comments/budget_investments_spec.rb
index 4f21b45eb..590ce6996 100644
--- a/spec/system/comments/budget_investments_spec.rb
+++ b/spec/system/comments/budget_investments_spec.rb
@@ -108,13 +108,15 @@ describe "Commenting Budget::Investments" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit budget_investment_path(investment.budget, investment, order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit budget_investment_path(investment.budget, investment, order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
diff --git a/spec/system/comments/debates_spec.rb b/spec/system/comments/debates_spec.rb
index b03e8fc4e..723413239 100644
--- a/spec/system/comments/debates_spec.rb
+++ b/spec/system/comments/debates_spec.rb
@@ -124,13 +124,15 @@ describe "Commenting debates" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit debate_path(debate, order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit debate_path(debate, order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
diff --git a/spec/system/comments/legislation_annotations_spec.rb b/spec/system/comments/legislation_annotations_spec.rb
index 0e8c04ec2..51b20e89f 100644
--- a/spec/system/comments/legislation_annotations_spec.rb
+++ b/spec/system/comments/legislation_annotations_spec.rb
@@ -116,19 +116,15 @@ describe "Commenting legislation questions" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
-                                                            legislation_annotation.draft_version,
-                                                            legislation_annotation,
-                                                            order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit legislation_process_draft_version_annotation_path(legislation_annotation.draft_version.process,
-                                                            legislation_annotation.draft_version,
-                                                            legislation_annotation,
-                                                            order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
diff --git a/spec/system/comments/legislation_questions_spec.rb b/spec/system/comments/legislation_questions_spec.rb
index 76b48573a..4bd067129 100644
--- a/spec/system/comments/legislation_questions_spec.rb
+++ b/spec/system/comments/legislation_questions_spec.rb
@@ -110,13 +110,15 @@ describe "Commenting legislation questions" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit legislation_process_question_path(legislation_question.process, legislation_question, order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit legislation_process_question_path(legislation_question.process, legislation_question, order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
diff --git a/spec/system/comments/polls_spec.rb b/spec/system/comments/polls_spec.rb
index 32fa4724b..a881d8620 100644
--- a/spec/system/comments/polls_spec.rb
+++ b/spec/system/comments/polls_spec.rb
@@ -104,13 +104,15 @@ describe "Commenting polls" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit poll_path(poll, order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit poll_path(poll, order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
diff --git a/spec/system/comments/proposals_spec.rb b/spec/system/comments/proposals_spec.rb
index 3348195b7..49dbab481 100644
--- a/spec/system/comments/proposals_spec.rb
+++ b/spec/system/comments/proposals_spec.rb
@@ -104,13 +104,15 @@ describe "Commenting proposals" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit proposal_path(proposal, order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit proposal_path(proposal, order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
diff --git a/spec/system/comments/topics_spec.rb b/spec/system/comments/topics_spec.rb
index 1b4483fc7..8541a0a1f 100644
--- a/spec/system/comments/topics_spec.rb
+++ b/spec/system/comments/topics_spec.rb
@@ -111,13 +111,15 @@ describe "Commenting topics from proposals" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit community_topic_path(community, topic, order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit community_topic_path(community, topic, order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
@@ -653,13 +655,15 @@ describe "Commenting topics from budget investments" do
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
 
-    visit community_topic_path(community, topic, order: :newest)
+    click_link "Newest first"
 
+    expect(page).to have_link "Newest first", class: "is-active"
     expect(c3.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c1.body)
 
-    visit community_topic_path(community, topic, order: :oldest)
+    click_link "Oldest first"
 
+    expect(page).to have_link "Oldest first", class: "is-active"
     expect(c1.body).to appear_before(c2.body)
     expect(c2.body).to appear_before(c3.body)
   end
diff --git a/spec/system/communities_spec.rb b/spec/system/communities_spec.rb
index 422260512..b827e5b5e 100644
--- a/spec/system/communities_spec.rb
+++ b/spec/system/communities_spec.rb
@@ -26,7 +26,7 @@ describe "Communities" do
       expect(page).to have_content "Participants (1)"
     end
 
-    scenario "Should display order selector and topic content when there are topics" do
+    scenario "Should display order links and topic content when there are topics" do
       proposal = create(:proposal)
       community = proposal.community
       topic = create(:topic, community: community)
@@ -34,7 +34,10 @@ describe "Communities" do
 
       visit community_path(community)
 
-      expect(page).to have_selector ".wide-order-selector"
+      expect(page).to have_link "Newest first", class: "is-active"
+      expect(page).to have_link "Most commented"
+      expect(page).to have_link "Oldest first"
+
       within "#topic_#{topic.id}" do
         expect(page).to have_content topic.title
         expect(page).to have_content "#{topic.comments_count} comment"