diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 7ed3c4d5..e66ae58d 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -337,7 +337,8 @@ class WikiController < ApplicationController
     @category = @params['category']
     if @category
       @set_name = "category '#{@category}'"
-      @pages_in_category = WikiReference.pages_in_category(@category).map { |page_name| @web.page(page_name) }.by_name
+      pages = WikiReference.pages_in_category(@category).sort.map { |page_name| @web.page(page_name) }
+      @pages_in_category = PageSet.new(@web, pages)
     else
       # no category specified, return all pages of the web
       @pages_in_category = @web.select_all.by_name
diff --git a/app/models/wiki_reference.rb b/app/models/wiki_reference.rb
index 4a8b6de6..26c9f29f 100644
--- a/app/models/wiki_reference.rb
+++ b/app/models/wiki_reference.rb
@@ -42,7 +42,7 @@ class WikiReference < ActiveRecord::Base
     query = 
         'SELECT name FROM pages JOIN wiki_references ON pages.id = wiki_references.page_id ' +
         'WHERE wiki_references.referenced_name = ? ' +
-        "AND wiki_references.link_type = '#{CATEGORY}'" +
+        "AND wiki_references.link_type = '#{CATEGORY}'"
     names = connection.select_all(sanitize_sql([query, category])).map { |row| row['name'] }
   end