diff --git a/src/ce_d2syn.pas b/src/ce_d2syn.pas
index 60aba8df..4895b783 100644
--- a/src/ce_d2syn.pas
+++ b/src/ce_d2syn.pas
@@ -143,6 +143,7 @@ type
 	public
 		constructor create(aOwner: TComponent); override;
     destructor destroy; override;
+    procedure Assign(Source: TPersistent); override;
     procedure GetTokenEx(out TokenStart: PChar; out TokenLength: integer); override;
     function GetDefaultAttribute(Index: integer): TSynHighlighterAttributes; override;
     procedure setLine(const NewValue: String; LineNumber: Integer); override;
@@ -337,6 +338,18 @@ begin
   inherited;
 end;
 
+procedure TSynD2Syn.Assign(Source: TPersistent);
+var
+  srcsyn: TSynD2Syn;
+begin
+  inherited;
+  if Source is TSynD2Syn then
+  begin
+    srcsyn := TSynD2Syn(Source);
+    FoldKinds := srcsyn.FoldKinds;
+  end;
+end;
+
 function TSynD2Syn.GetRangeClass: TSynCustomHighlighterRangeClass;
 begin
   result := TSynD2SynRange;
diff --git a/src/ce_synmemo.pas b/src/ce_synmemo.pas
index 78758977..8bb8a359 100644
--- a/src/ce_synmemo.pas
+++ b/src/ce_synmemo.pas
@@ -337,7 +337,6 @@ begin
   end;
   //
   Highlighter := D2Syn;
-  D2Syn.FoldKinds := [fkBrackets, fkComments1, fkComments2, fkStrings, fkRegion];
   //
   fTempFileName := GetTempDir(false) + 'temp_' + uniqueObjStr(self) + '.d';
   fFilename := '<new document>';