diff --git a/ui/src/components/ai-chat/index.vue b/ui/src/components/ai-chat/index.vue
index a6cdb838625..1936cd53b79 100644
--- a/ui/src/components/ai-chat/index.vue
+++ b/ui/src/components/ai-chat/index.vue
@@ -47,7 +47,12 @@
     </div>
     <el-popover
       v-if="!firsUserInput && !isNarrow"
-      v-model:visible="showUserInput"
+      :visible="showUserInput"
+      @update:visible="
+        (v: boolean) => {
+          if (v) showUserInput = true
+        }
+      "
       :virtual-ref="triggerEl"
       virtual-triggering
       trigger="manual"
diff --git a/ui/src/components/dynamics-form/index.vue b/ui/src/components/dynamics-form/index.vue
index ac75abbbf6b..ba8ec54217d 100644
--- a/ui/src/components/dynamics-form/index.vue
+++ b/ui/src/components/dynamics-form/index.vue
@@ -141,6 +141,17 @@ watch(
   },
   { deep: true },
 )
+
+watch(
+  () => props.modelValue,
+  (val) => {
+    if (!val) return
+    if (_.isEqual(val, formValue.value)) return
+    formValue.value = _.cloneDeep(val)
+  },
+  { deep: true },
+)
+
 function renderTemplate(template: string, data: any) {
   return template.replace(/\$\{(\w+)\}/g, (match, key) => {
     return data[key] !== undefined ? data[key] : match