diff --git a/lib/issues_helper_patch.rb b/lib/issues_helper_patch.rb
index f3b07fb..2bcea2d 100644
--- a/lib/issues_helper_patch.rb
+++ b/lib/issues_helper_patch.rb
@@ -14,6 +14,16 @@ module SmartIssuesSort
       module InstanceMethods
         def sidebar_queries_with_category
           unless @sidebar_queries
+            if Redmine::VERSION::MAJOR > 2 || 
+              (Redmine::VERSION::MAJOR == 2 && Redmine::VERSION::MINOR >= 3)  
+              @sidebar_queries = IssueQuery.visible.all(
+                :order => "#{IssueQuery.table_name}.name ASC",
+                # Project specific queries and global queries
+                :conditions => (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]),
+                # Make sure we load category as well
+                :select => [:name, :category, :is_public]
+              )
+            else
               @sidebar_queries = Query.visible.all(
                 :order => "#{Query.table_name}.name ASC",
                 # Project specific queries and global queries
@@ -22,6 +32,7 @@ module SmartIssuesSort
                 :select => [:name, :category, :is_public]
               )
             end
+          end
           @sidebar_queries
         end
 
diff --git a/lib/query_patch.rb b/lib/query_patch.rb
index 00f4343..93c37ce 100644
--- a/lib/query_patch.rb
+++ b/lib/query_patch.rb
@@ -94,9 +94,16 @@ module SmartIssuesSort
   end
 end
 
+if Redmine::VERSION::MAJOR > 2 || 
+   (Redmine::VERSION::MAJOR == 2 && Redmine::VERSION::MINOR >= 3) 
+  unless IssueQuery.included_modules.include? SmartIssuesSort::Patches::QuerySortCriteriaPatch
+    IssueQuery.send(:include, SmartIssuesSort::Patches::QuerySortCriteriaPatch)
+  end
+else
   unless Query.included_modules.include? SmartIssuesSort::Patches::QuerySortCriteriaPatch
     Query.send(:include, SmartIssuesSort::Patches::QuerySortCriteriaPatch)
   end
+end
 
 unless Redmine::Helpers::Gantt.included_modules.include? SmartIssuesSort::Patches::GanttChartPatch
   Redmine::Helpers::Gantt.send(:include, SmartIssuesSort::Patches::GanttChartPatch)