diff --git a/external/builder/builder.js b/external/builder/builder.js
index 2666594d568d7..a20d216344e51 100644
--- a/external/builder/builder.js
+++ b/external/builder/builder.js
@@ -209,7 +209,10 @@ function preprocess(inFilename, outFilename, defines) {
         !stack.includes(STATE_ELSE_FALSE)
       ) {
         writeLine(
-          line.replace(/^\/\/|^\/\*|^<!--/g, "  ").replace(/\*\/$|-->$/g, "")
+          line
+            .replace(/^\/\/|^<!--/g, "  ")
+            .replace(/(^\s*)\/\*/g, "$1  ")
+            .replace(/\*\/$|-->$/g, "")
         );
       }
     }
diff --git a/external/builder/fixtures/css-comment-expected.css b/external/builder/fixtures/css-comment-expected.css
index 52776297b3dbb..7972ddd0df3e1 100644
--- a/external/builder/fixtures/css-comment-expected.css
+++ b/external/builder/fixtures/css-comment-expected.css
@@ -1,4 +1,5 @@
 /* Comment here... */
   div {
     margin: 0;
+    padding: 0;
   }
diff --git a/external/builder/fixtures/css-comment.css b/external/builder/fixtures/css-comment.css
index 3d22a0f69957e..bdfe64ccce4ab 100644
--- a/external/builder/fixtures/css-comment.css
+++ b/external/builder/fixtures/css-comment.css
@@ -2,5 +2,6 @@
 /*#if TRUE*/
 /*div {*/
 /*  margin: 0;*/
+  /*padding: 0;*/
 /*}*/
 /*#endif*/