diff --git a/src/Perplex.ContentBlocks.Core/PropertyEditor/ContentBlocksValueEditor.cs b/src/Perplex.ContentBlocks.Core/PropertyEditor/ContentBlocksValueEditor.cs
index d42acc3..c56ca1a 100644
--- a/src/Perplex.ContentBlocks.Core/PropertyEditor/ContentBlocksValueEditor.cs
+++ b/src/Perplex.ContentBlocks.Core/PropertyEditor/ContentBlocksValueEditor.cs
@@ -117,7 +117,11 @@ void FromEditor(BlockItemData? data)
                     continue;
                 }
 
-                var propData = new ContentPropertyData(prop.Value, configuration);
+                var propData = new ContentPropertyData(prop.Value, configuration)
+                {
+                    ContentKey = editorValue.ContentKey,
+                    PropertyTypeKey = prop.PropertyType.Key,
+                };
                 prop.Value = valueEditor.FromEditor(propData, prop.Value);
             }
         }