diff --git a/components/codetools/codecompletiontool.pas b/components/codetools/codecompletiontool.pas
index 88d9b3b01d..9299c0fe83 100644
--- a/components/codetools/codecompletiontool.pas
+++ b/components/codetools/codecompletiontool.pas
@@ -1465,7 +1465,7 @@ begin
         break;
       end;
       StartProcNode:=CurProcNode;
-      CurProcNode:=FindPrevNodeOnSameLvl(CurProcNode);
+      CurProcNode:=CurProcNode.PriorBrother;
     until (CurProcNode=nil) or (CurProcNode.Desc<>ctnProcedure)
     or ((CurProcNode.SubDesc and ctnsForwardDeclaration)=0);
 
@@ -1484,7 +1484,7 @@ begin
         break;
       end;
       EndProcNode:=CurProcNode;
-      CurProcNode:=FindNextNodeOnSameLvl(CurProcNode);
+      CurProcNode:=CurProcNode.NextBrother;
     until (CurProcNode=nil) or (CurProcNode.Desc<>ctnProcedure)
     or ((CurProcNode.SubDesc and ctnsForwardDeclaration)=0);