diff --git a/api/js/etemplate/Et2Widget/Et2Widget.ts b/api/js/etemplate/Et2Widget/Et2Widget.ts
index 6a639873e4..701cb41347 100644
--- a/api/js/etemplate/Et2Widget/Et2Widget.ts
+++ b/api/js/etemplate/Et2Widget/Et2Widget.ts
@@ -1196,11 +1196,11 @@ const Et2WidgetMixin = <T extends Constructor>(superClass : T) =>
 			}
 
 			let widget_class = window.customElements.get(this.localName);
-			let properties = widget_class ? widget_class.properties : [];
-			for(let key in properties)
+			let properties = widget_class ? widget_class.elementProperties : [];
+			properties.forEach((v, key) =>
 			{
 				copy[key] = this[key];
-			}
+			});
 
 			// Keep the deferred properties
 			copy._deferred_properties = this._deferred_properties;
diff --git a/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts b/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts
index f07dc1d442..21e79da259 100644
--- a/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts
+++ b/api/js/etemplate/et2_extension_nextmatch_rowProvider.ts
@@ -296,11 +296,11 @@ export class et2_nextmatch_rowProvider
 
 		// N.B. cloneNode widget is missing its unreflected properties and we need to get them from original
 		let widget_class = window.customElements.get(widget.localName);
-		let properties = widget_class ? widget_class.properties : [];
-		for(let key in properties)
+		let properties = widget_class ? widget_class.elementProperties : [];
+		properties.forEach((v, key) =>
 		{
 			widget[key] = original[key];
-		}
+		});
 
 		if(!widget || widget.localName !== entry.widget.localName)
 		{