diff --git a/components/codetools/basiccodetools.pas b/components/codetools/basiccodetools.pas
index f30a1f3dd5..2ea721ccef 100644
--- a/components/codetools/basiccodetools.pas
+++ b/components/codetools/basiccodetools.pas
@@ -61,7 +61,8 @@ function CleanCodeFromComments(const DirtyCode: string;
     NestedComments: boolean): string;
 function ExtractCommentContent(const ASource: string; CommentStart: integer;
     NestedComments: boolean;
-    TrimStart: boolean = false; TrimEnd: boolean = false): string;
+    TrimStart: boolean = false; TrimEnd: boolean = false;
+    TrimPasDoc: boolean = false): string;
 function FindMainUnitHint(const ASource: string; out Filename: string): boolean;
 
 // indent
@@ -2787,7 +2788,8 @@ begin
 end;
 
 function ExtractCommentContent(const ASource: string; CommentStart: integer;
-  NestedComments: boolean; TrimStart: boolean; TrimEnd: boolean): string;
+  NestedComments: boolean; TrimStart: boolean; TrimEnd: boolean;
+  TrimPasDoc: boolean): string;
 var
   CommentEnd: LongInt;
   StartPos: LongInt;
@@ -2820,6 +2822,10 @@ begin
         dec(EndPos);
     end;
   end;
+  if TrimPasDoc then begin
+    if (StartPos<EndPos) and (ASource[StartPos]='<') then
+      inc(StartPos);
+  end;
   if TrimStart then begin
     while (StartPos<EndPos) and (ASource[StartPos] in [' ',#9,#10,#13]) do
       inc(StartPos);
diff --git a/ide/codehelp.pas b/ide/codehelp.pas
index ad9092abcf..436aae156b 100644
--- a/ide/codehelp.pas
+++ b/ide/codehelp.pas
@@ -1847,7 +1847,7 @@ begin
               then
                 continue;
               CommentStr:=ExtractCommentContent(CommentCode.Source,CommentStart,
-                                                NestedComments,true,true);
+                                                NestedComments,true,true,true);
               if CommentStr<>'' then begin
                 if not ItemAdded then begin
                   AddText(Item.ElementName+LineEnding