diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index ca452a41a..c85e014e0 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -19,11 +19,14 @@
 
 module QueriesHelper
   def filters_options_for_select(query)
+    options_for_select(filters_options(query))
+  end
+
+  def filters_options(query)
     options = [[]]
     options += query.available_filters.sort {|a,b| a[1][:order] <=> b[1][:order]}.map do |field, field_options|
       [field_options[:name], field]
     end
-    options_for_select(options)
   end
 
   def column_header(column)
diff --git a/test/unit/helpers/queries_helper_test.rb b/test/unit/helpers/queries_helper_test.rb
new file mode 100644
index 000000000..bcecaeae6
--- /dev/null
+++ b/test/unit/helpers/queries_helper_test.rb
@@ -0,0 +1,41 @@
+# Redmine - project management software
+# Copyright (C) 2006-2012  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require File.expand_path('../../../test_helper', __FILE__)
+
+class QueriesHelperTest < ActionView::TestCase
+  include QueriesHelper
+
+  fixtures :projects, :enabled_modules, :users, :members,
+           :member_roles, :roles, :trackers, :issue_statuses,
+           :issue_categories, :enumerations, :issues,
+           :watchers, :custom_fields, :custom_values, :versions,
+           :queries,
+           :projects_trackers,
+           :custom_fields_trackers
+
+  def test_order
+    User.current = User.find_by_login('admin')
+    query = Query.new(:project => nil, :name => '_')
+    assert_equal 30, query.available_filters.size
+    fo = filters_options(query)
+    assert_equal 31, fo.size
+    assert_equal [], fo[0]
+    assert_equal "tracker_id", fo[3][1]
+    assert_equal "priority_id", fo[4][1]
+  end
+end