diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 80bae11cb..eb3034711 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.5.10
  - fix: Syntax error in GetCsMail
+ - fixed: Thingy: field types not in alphabetical order
 
 7.5.9
  - fixed: Collaboration System attachments follow site's max size instead of CS's
diff --git a/lib/WebGUI/Asset/Wobject/Thingy.pm b/lib/WebGUI/Asset/Wobject/Thingy.pm
index 35bd9e6ff..05c0ba4ee 100644
--- a/lib/WebGUI/Asset/Wobject/Thingy.pm
+++ b/lib/WebGUI/Asset/Wobject/Thingy.pm
@@ -371,6 +371,7 @@ sub getEditFieldForm {
         }
         $fieldTypes{$fieldType} = $form->getName($self->session);       
     }
+    %fieldTypes = WebGUI::Utility::sortHash(%fieldTypes);
     
     $things = $self->session->db->read('select thingId, Thingy_things.label, count(*) from Thingy_things '
         .'left join Thingy_fields using(thingId) where Thingy_things.assetId = ? and fieldId != "" '