diff --git a/hb_server/apps/wf/views.py b/hb_server/apps/wf/views.py
index 7dfa9c2..9b5354a 100644
--- a/hb_server/apps/wf/views.py
+++ b/hb_server/apps/wf/views.py
@@ -105,7 +105,7 @@ class TransitionViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin,
 
 class CustomFieldViewSet(CreateModelMixin, UpdateModelMixin, RetrieveModelMixin, DestroyModelMixin, GenericViewSet):
     perms_map = {'*':'*'}
-    queryset = CustomField.objects.all()
+    queryset = CustomField.objects.all().order_by('sort')
     serializer_class = CustomFieldSerializer
     search_fields = ['field_name']
     filterset_fields = ['workflow', 'field_type']
@@ -205,7 +205,7 @@ class TicketViewSet(OptimizationMixin, CreateUpdateCustomMixin, CreateModelMixin
         vdata = serializer.validated_data
         new_ticket_data = ticket.ticket_data
         new_ticket_data.update(**vdata['ticket_data'])
-        
+
         ticket = WfService.handle_ticket(ticket=ticket, transition=vdata['transition'], 
         new_ticket_data=new_ticket_data, handler=request.user, suggestion=vdata['suggestion'])
         return Response(TicketSerializer(instance=ticket).data)