diff --git a/client/src/components/Form/Elements/FormData/FormData.vue b/client/src/components/Form/Elements/FormData/FormData.vue
index fcf318eed15..a591a8d9012 100644
--- a/client/src/components/Form/Elements/FormData/FormData.vue
+++ b/client/src/components/Form/Elements/FormData/FormData.vue
@@ -109,6 +109,17 @@ const currentValue = computed({
         return null;
     },
     set: (val) => {
+        if (val && Array.isArray(val) && val.length > 0) {
+            val.sort((a, b) => {
+                const aHid = a.hid;
+                const bHid = b.hid;
+                if (aHid && bHid) {
+                    return aHid - bHid;
+                } else {
+                    return 0;
+                }
+            });
+        }
         $emit("input", createValue(val));
     },
 });