diff --git a/app/models/query.rb b/app/models/query.rb
index b2d018906..5e76b17fe 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -141,7 +141,7 @@ class Query < ActiveRecord::Base
     QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
     QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
     QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
-    QueryColumn.new(:fixed_version, :sortable => ["#{Version.table_name}.effective_date", "#{Version.table_name}.name"], :default_order => 'desc', :groupable => true),
+    QueryColumn.new(:fixed_version, :sortable => lambda {Version.fields_for_order_statement}, :default_order => 'desc', :groupable => true),
     QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
     QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
     QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
diff --git a/app/models/version.rb b/app/models/version.rb
index 600b9813a..bb0e7ec42 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -184,6 +184,11 @@ class Version < ActiveRecord::Base
     end
   end
 
+  def self.fields_for_order_statement(table=nil)
+    table ||= table_name
+    %w(effective_date name).map {|field| "#{table}.#{field}"}
+  end
+
   # Returns the sharings that +user+ can set the version to
   def allowed_sharings(user = User.current)
     VERSION_SHARINGS.select do |s|