diff --git a/app/serializers/site_category_serializer.rb b/app/serializers/site_category_serializer.rb
index 120f2986705..67a27c980b2 100644
--- a/app/serializers/site_category_serializer.rb
+++ b/app/serializers/site_category_serializer.rb
@@ -9,6 +9,10 @@ class SiteCategorySerializer < BasicCategorySerializer
 
   has_many :category_required_tag_groups, key: :required_tag_groups, embed: :objects
 
+  def form_template_ids
+    object.form_template_ids.sort
+  end
+
   def include_allowed_tags?
     SiteSetting.tagging_enabled
   end
diff --git a/spec/system/page_objects/pages/category.rb b/spec/system/page_objects/pages/category.rb
index 461bcb15002..c5e863d9894 100644
--- a/spec/system/page_objects/pages/category.rb
+++ b/spec/system/page_objects/pages/category.rb
@@ -51,7 +51,7 @@ module PageObjects
       end
 
       def has_selected_template?(template_name)
-        find(".select-category-template .select-kit-header")["data-name"] == template_name
+        has_css?(".select-category-template .select-kit-header[data-name='#{template_name}']")
       end
 
       def toggle_form_templates