diff --git a/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala b/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala
index 5202d3b0c..0c2135f8a 100644
--- a/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala
+++ b/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala
@@ -644,6 +644,7 @@ class CppCompiler(
       outSrc.puts(s"${kaitaiType2NativeType(onType)} on = ${expression(on)};")
     } else {
       outSrc.puts(s"switch (${expression(on)}) {")
+      outSrc.inc
     }
   }
 
@@ -693,6 +694,7 @@ class CppCompiler(
       outSrc.dec
       outSrc.puts("}")
     } else {
+      outSrc.dec
       outSrc.puts("}")
     }