diff --git a/uidesigner/vfd_props.pas b/uidesigner/vfd_props.pas
index b4cadccb8..13a90db09 100644
--- a/uidesigner/vfd_props.pas
+++ b/uidesigner/vfd_props.pas
@@ -392,6 +392,7 @@ function TVFDPropertyList.ParseSourceLine(wg: TfpgWidget; const line: string): b
 var
   s: string;
   pval: pointer;
+  sval: String;
 begin
   s      := line;
   Result := False;
@@ -401,9 +402,11 @@ function TVFDPropertyList.ParseSourceLine(wg: TfpgWidget; const line: string): b
   Result := CheckSymbol(s, ':=');
   if Result then
   begin
-    pval   := TListPropertyEditorClass(EditorClass).GetItemFromString(List, s);
+    sval := GetIdentifier(s);
+    pval   := TListPropertyEditorClass(EditorClass).GetItemFromString(List, sval);
     Result := CheckSymbol(s, ';');
-    TListPropertyEditorClass(EditorClass).SetWidgetProperty(wg, Name, pval);
+    if Result then
+      TListPropertyEditorClass(EditorClass).SetWidgetProperty(wg, Name, pval);
   end;
 end;
 
diff --git a/uidesigner/vfd_widgetclass.pas b/uidesigner/vfd_widgetclass.pas
index c79818702..c69dfa9d2 100644
--- a/uidesigner/vfd_widgetclass.pas
+++ b/uidesigner/vfd_widgetclass.pas
@@ -99,7 +99,7 @@   TVFDWidgetClass = class(TObject)
 implementation
 
 uses
-  TypInfo, vfdprops;
+  TypInfo, vfd_props;
   
 
 type