diff --git a/components/jcf2/Process/Spacing/SingleSpaceAfter.pas b/components/jcf2/Process/Spacing/SingleSpaceAfter.pas
index 210a808ea4..cdc3fd551b 100644
--- a/components/jcf2/Process/Spacing/SingleSpaceAfter.pas
+++ b/components/jcf2/Process/Spacing/SingleSpaceAfter.pas
@@ -61,7 +61,11 @@ const
   SingleSpaceAfterWords: TTokenTypeSet = [
     ttProcedure, ttFunction,
     ttConstructor, ttDestructor, ttProperty,
-    ttOf, ttDo, ttWhile, ttUntil, ttCase, ttIf, ttTo, ttDownTo, ttGeneric];
+    ttOf, ttDo, ttWhile, ttUntil, ttCase, ttIf, ttTo, ttDownTo, ttGeneric,
+    ttWith, ttSpecialize];
+
+  SingleSpaceAfterClass: TTokenTypeSet = [ttConstructor, ttDestructor,
+  ttFunction, ttProcedure, ttOperator, ttVar, ttThreadvar];
 
   PossiblyUnaryOperators: TTokenTypeSet = [ttPlus, ttMinus];
 
@@ -74,6 +78,9 @@ begin
 
   Result := False;
 
+  if (pt.TokenType=ttClass) and (pt.NextSolidTokenType in SingleSpaceAfterClass) then
+    Exit(True);
+
   if pt.HasParentNode(nLiteralString) then
     exit;