diff --git a/client/web/compose/src/components/PageBlocks/RecordBase.vue b/client/web/compose/src/components/PageBlocks/RecordBase.vue
index e1a98d44d..ad560c695 100644
--- a/client/web/compose/src/components/PageBlocks/RecordBase.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordBase.vue
@@ -92,7 +92,7 @@ export default {
 
       if (!this.options.fields || this.options.fields.length === 0) {
         // No fields defined in the options, show all (buy system)
-        return this.module.fields.slice().sort((a, b) => a.label.localeCompare(b.label))
+        return this.module.fields
       }
 
       // Show filtered & ordered list of fields
diff --git a/client/web/compose/src/components/PageBlocks/RecordEditor.vue b/client/web/compose/src/components/PageBlocks/RecordEditor.vue
index e3ed8efd5..73bc14b80 100644
--- a/client/web/compose/src/components/PageBlocks/RecordEditor.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordEditor.vue
@@ -118,8 +118,8 @@ export default {
       }
 
       if (!this.options.fields || this.options.fields.length === 0) {
-        // No fields defined in the options, show all (buy system)
-        return this.module.fields.slice().sort((a, b) => a.label.localeCompare(b.label))
+        // No fields defined in the options, show all (but system)
+        return this.module.fields
       }
 
       // Show filtered & ordered list of fields