diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9df37a677c0c128576b3f67b7af77532476878c7..fb5900054ceba169018d448e93e278c5d39bb763 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -409,8 +409,8 @@ class ApplicationController < ActionController::Base
   private
 
   def set_default_sort
-    controller_name = params[:controller].sub(/Controller\Z/, '').underscore
-    cookie_suffix   = "_sort_#{controller_name}"
+    # Use the controller name so we have a distinct cookie for Issues, MRs and Dashboard
+    cookie_suffix   = "_sort_#{params[:controller].underscore}"
 
     key = "#{(@project || @group || current_user).cookie_key}#{cookie_suffix}"