diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas
index 8ad515318f..d2f7751804 100644
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@@ -4423,10 +4423,12 @@ var
     if AtomIsChar(';') then exit;
     AtomIsIdentifier(true);
     if WordIsPropertySpecifier.DoItCaseInsensitive(Src,CurPos.StartPos,
-        CurPos.EndPos-CurPos.StartPos) then exit;
+      CurPos.EndPos-CurPos.StartPos)
+    then
+      exit;
     Parts[SpecParam]:=CurPos;
     ReadNextAtom;
-    if CurPos.Flag=cafPoint then begin
+    while CurPos.Flag=cafPoint do begin
       ReadNextAtom;
       AtomIsIdentifier(true);
       ReadNextAtom;