diff --git a/components/codetools/codebeautifier.pas b/components/codetools/codebeautifier.pas
index 8ac4edbe23..a2188cfef0 100644
--- a/components/codetools/codebeautifier.pas
+++ b/components/codetools/codebeautifier.pas
@@ -1464,7 +1464,7 @@ function TFullyAutomaticBeautifier.AdjustByNextAtom(
   begin
     if StackTopType=bbtDefinition then
       EndBlock;
-    if StackTopType in bbtAllIdentifierSections then
+    if StackTopType in (bbtAllIdentifierSections-[bbtClassSection]) then
       EndBlock;
     BeginBlock(bbtProcedure);
   end;