diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
index 093c418abb..c069ba76c9 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.XamlDom/Project/XamlProperty.cs
@@ -248,8 +248,9 @@ namespace ICSharpCode.WpfDesign.XamlDom
 				try {
 					ValueOnInstance = PropertyValue.GetValueFor(propertyInfo);
 					
-					if (this.parentObject.XamlSetTypeConverter != null)
+					if (this.parentObject.XamlSetTypeConverter != null && propertyValue is XamlTextValue) {
 						this.ParentObject.XamlSetTypeConverter(this.parentObject.Instance, new XamlSetTypeConverterEventArgs(this.SystemXamlMemberForProperty, null, ((XamlTextValue) propertyValue).Text, this.parentObject.OwnerDocument.GetTypeDescriptorContext(this.parentObject), null));
+					}
 
 					if (propertyInfo.DependencyProperty == DesignTimeProperties.DesignWidthProperty) {
 						var widthProperty = this.ParentObject.Properties.FirstOrDefault(x => x.DependencyProperty == FrameworkElement.WidthProperty);