diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index b336a924a..33d2e0b30 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -13,6 +13,7 @@ class DebatesController < ApplicationController
     @debates = @debates.page(params[:page]).for_render.send("sort_by_#{@order}")
     @tag_cloud = Debate.tag_counts.order(taggings_count: :desc, name: :asc).limit(20)
     set_debate_votes(@debates)
+    set_return_query_params(@order)
   end
 
   def show
@@ -93,6 +94,11 @@ class DebatesController < ApplicationController
       end
     end
 
+    def set_return_query_params(order)
+      session[:return_page] = params[:page] if params[:page]
+      session[:return_order] = order
+    end
+
     def parse_search_terms
       @search_terms = params[:search] if params[:search].present?
     end