diff --git a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
index 3e2b16a6..3792b926 100644
--- a/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
+++ b/src/Generator/Generators/CLI/CLIHeadersTemplate.cs
@@ -551,7 +551,7 @@ namespace CppSharp.Generators.CLI
             if(isSetter) WriteLine("void set({0});", type);
 
             WriteCloseBraceIndent();
-            PopBlock();
+            PopBlock(NewLineKind.BeforeNextBlock);
         }
 
         public void GenerateMethod(Method method)
@@ -586,7 +586,7 @@ namespace CppSharp.Generators.CLI
 
             WriteLine(";");
 
-            PopBlock(NewLineKind.Always);
+            PopBlock(NewLineKind.BeforeNextBlock);
         }
 
         public bool GenerateTypedef(TypedefDecl typedef)