diff --git a/app/controllers/moderation/comments_controller.rb b/app/controllers/moderation/comments_controller.rb
index 3d8d960aa..0ed71a8eb 100644
--- a/app/controllers/moderation/comments_controller.rb
+++ b/app/controllers/moderation/comments_controller.rb
@@ -1,5 +1,5 @@
 class Moderation::CommentsController < Moderation::BaseController
-  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
+  has_filters %w{pending_flag_review all with_ignored_flag}, only: :index
 
   before_action :load_comments, only: :index
 
diff --git a/app/controllers/moderation/debates_controller.rb b/app/controllers/moderation/debates_controller.rb
index ce970b082..c54851cb9 100644
--- a/app/controllers/moderation/debates_controller.rb
+++ b/app/controllers/moderation/debates_controller.rb
@@ -1,5 +1,5 @@
 class Moderation::DebatesController < Moderation::BaseController
-  has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
+  has_filters %w{pending_flag_review all with_ignored_flag}, only: :index
 
   before_action :load_debates, only: :index
 
diff --git a/spec/features/moderation/comments_spec.rb b/spec/features/moderation/comments_spec.rb
index 4fdef5c10..96a91a9b1 100644
--- a/spec/features/moderation/comments_spec.rb
+++ b/spec/features/moderation/comments_spec.rb
@@ -102,8 +102,8 @@ feature 'Moderate Comments' do
 
     scenario "Current filter is properly highlighted" do
       visit moderation_comments_path
-      expect(page).to_not have_link('All')
-      expect(page).to have_link('Pending')
+      expect(page).to_not have_link('Pending')
+      expect(page).to have_link('All')
       expect(page).to have_link('Ignored')
 
       visit moderation_comments_path(filter: 'all')
@@ -191,6 +191,8 @@ feature 'Moderate Comments' do
 
         expect(current_path).to eq(moderation_comments_path)
 
+        click_link('Ignored')
+
         within("#comment_#{@comment.id}") do
           expect(page).to have_content('Ignored')
         end
diff --git a/spec/features/moderation/debates_spec.rb b/spec/features/moderation/debates_spec.rb
index 60ec2c0cf..1df1776c7 100644
--- a/spec/features/moderation/debates_spec.rb
+++ b/spec/features/moderation/debates_spec.rb
@@ -45,8 +45,8 @@ feature 'Moderate debates' do
 
     scenario "Current filter is properly highlighted" do
       visit moderation_debates_path
-      expect(page).to_not have_link('All')
-      expect(page).to have_link('Pending')
+      expect(page).to_not have_link('Pending')
+      expect(page).to have_link('All')
       expect(page).to have_link('Ignored')
 
       visit moderation_debates_path(filter: 'all')
@@ -133,6 +133,8 @@ feature 'Moderate debates' do
 
         expect(current_path).to eq(moderation_debates_path)
 
+        click_link('All')
+
         within("#debate_#{@debate.id}") do
           expect(page).to have_content('Ignored')
         end