diff --git a/app/models/query.rb b/app/models/query.rb
index 61a559d16..09dc0d581 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -223,7 +223,7 @@ class Query < ActiveRecord::Base
     return @available_columns if @available_columns
     @available_columns = Query.available_columns
     @available_columns += (project ? 
-                            project.custom_fields :
+                            project.all_custom_fields :
                             IssueCustomField.find(:all, :conditions => {:is_for_all => true})
                            ).collect {|cf| QueryCustomFieldColumn.new(cf) }      
   end