diff --git a/client/src/components/Form/FormDisplay.vue b/client/src/components/Form/FormDisplay.vue
index 4ab57c878eb0..200a5d32f669 100644
--- a/client/src/components/Form/FormDisplay.vue
+++ b/client/src/components/Form/FormDisplay.vue
@@ -165,7 +165,6 @@ export default {
             });
         },
         onChangeForm() {
-            this.formInputs = JSON.parse(JSON.stringify(this.formInputs));
             this.onChange(true);
         },
         onCloneInputs() {
diff --git a/client/src/components/Form/FormRepeat.vue b/client/src/components/Form/FormRepeat.vue
index 88617f1864cd..b2cf51a3b384 100644
--- a/client/src/components/Form/FormRepeat.vue
+++ b/client/src/components/Form/FormRepeat.vue
@@ -4,6 +4,8 @@ import { faCaretDown, faCaretUp, faPlus, faTrashAlt } from "@fortawesome/free-so
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { defineAsyncComponent, nextTick, type PropType } from "vue";
 
+import { useKeyedObjects } from "@/composables/keyedObjects";
+
 import FormCard from "./FormCard.vue";
 
 const FormNode = defineAsyncComponent(() => import("./FormInputs.vue"));
@@ -82,6 +84,8 @@ function getButtonId(index: number, direction: "up" | "down") {
     const prefix = getPrefix(index);
     return `${prefix}_${direction}`;
 }
+
+const { keyObject } = useKeyedObjects();
 </script>
 
 <template>
@@ -93,7 +97,7 @@ function getButtonId(index: number, direction: "up" | "down") {
 
         <FormCard
             v-for="(cache, cacheId) in props.input.cache"
-            :key="cacheId"
+            :key="keyObject(cache)"
             data-description="repeat block"
             class="card"
             :title="getTitle(cacheId)">