diff --git a/src/language-handlebars/printer-glimmer.js b/src/language-handlebars/printer-glimmer.js
index 19249ff52a9a..86fbedd74912 100644
--- a/src/language-handlebars/printer-glimmer.js
+++ b/src/language-handlebars/printer-glimmer.js
@@ -535,19 +535,22 @@ function printOpenBlock(path, print) {
 
   const attributes = [printPath(path, print)];
 
-  const params = printParams(path, print);
-  if (params) {
-    attributes.push(line, params);
+  const pparams = printParams(path, print);
+  let params = [];
+  if (pparams) {
+    params = [line, group(pparams)];
   }
 
+  let blockParams = [];
   if (isNonEmptyArray(node.program.blockParams)) {
-    const block = printBlockParams(node.program);
-    attributes.push(line, block);
+    blockParams = [line, printBlockParams(node.program)];
   }
 
   return group([
     openingMustache,
     indent(attributes),
+    indent(params),
+    indent(blockParams),
     softline,
     closingMustache,
   ]);
@@ -564,8 +567,12 @@ function printElseBlock(node, options) {
 
 function printElseIfLikeBlock(path, print, ifLikeKeyword) {
   const node = path.getValue();
-  let blockParams = [];
 
+  const attributes = group(["else", line, ifLikeKeyword]);
+
+  const params = [line, group(printParams(path, print))];
+
+  let blockParams = [];
   if (isNonEmptyArray(node.program.blockParams)) {
     blockParams = [line, printBlockParams(node.program)];
   }
@@ -574,13 +581,8 @@ function printElseIfLikeBlock(path, print, ifLikeKeyword) {
 
   return group([
     printInverseBlockOpeningMustache(parentNode),
-    indent(
-      group([
-        group(["else", line, ifLikeKeyword]),
-        line,
-        printParams(path, print),
-      ])
-    ),
+    indent(attributes),
+    indent(params),
     indent(blockParams),
     softline,
     printInverseBlockClosingMustache(parentNode),