diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 90b628f269..1e23969afa 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1271,7 +1271,10 @@ frappe.ui.form.Form = class FrappeForm {
 		}
 		if (df && df[property] != value) {
 			df[property] = value;
-			this.refresh_field(fieldname);
+			if (!docname || !table_field) {
+				// do not refresh childtable fields since `this.fields_dict` doesn't have child table fields
+				this.refresh_field(fieldname);
+			}
 		}
 	}
 
diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js
index db45acf361..e0aa2d645e 100644
--- a/frappe/public/js/frappe/form/layout.js
+++ b/frappe/public/js/frappe/form/layout.js
@@ -510,6 +510,8 @@ frappe.ui.form.Layout = Class.extend({
 		if (form_obj) {
 			if (this.doc && this.doc.parent) {
 				form_obj.set_df_property(this.doc.parentfield, property, value, this.doc.parent, fieldname);
+				// refresh child fields
+				this.fields_dict[fieldname] && this.fields_dict[fieldname].refresh();
 			} else {
 				form_obj.set_df_property(fieldname, property, value);
 			}