diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb
index 842487ac..bef6d5aa 100644
--- a/lib/sidekiq/api.rb
+++ b/lib/sidekiq/api.rb
@@ -118,7 +118,7 @@ module Sidekiq
     include Enumerable
 
     def self.all
-      Sidekiq.redis {|c| c.smembers('queues') }.map {|q| Sidekiq::Queue.new(q) }
+      Sidekiq.redis {|c| c.smembers('queues') }.sort.map {|q| Sidekiq::Queue.new(q) }
     end
 
     attr_reader :name
diff --git a/lib/sidekiq/web.rb b/lib/sidekiq/web.rb
index 4dc23afa..26229a28 100644
--- a/lib/sidekiq/web.rb
+++ b/lib/sidekiq/web.rb
@@ -58,7 +58,6 @@ module Sidekiq
 
     get "/queues" do
       @queues = Sidekiq::Queue.all
-      @queues.sort! {|a,b| a.name <=> b.name}
       erb :queues
     end