diff --git a/src/alejandra_engine/src/builder.rs b/src/alejandra_engine/src/builder.rs
index 65eb68d..713370d 100644
--- a/src/alejandra_engine/src/builder.rs
+++ b/src/alejandra_engine/src/builder.rs
@@ -301,3 +301,21 @@ pub fn fits_in_single_line(
         None => false,
     }
 }
+
+pub fn make_isolated_token(
+    kind: rnix::SyntaxKind,
+    text: &str,
+) -> rnix::SyntaxToken {
+    use rowan::Language;
+
+    let mut builder = rowan::GreenNodeBuilder::new();
+    builder.start_node(rnix::NixLanguage::kind_to_raw(
+        rnix::SyntaxKind::NODE_ROOT,
+    ));
+    builder.token(rnix::NixLanguage::kind_to_raw(kind), text);
+    builder.finish_node();
+
+    let node = builder.finish();
+
+    rnix::SyntaxNode::new_root(node).first_token().unwrap()
+}
diff --git a/src/alejandra_engine/src/children.rs b/src/alejandra_engine/src/children.rs
index 928515f..572affc 100644
--- a/src/alejandra_engine/src/children.rs
+++ b/src/alejandra_engine/src/children.rs
@@ -35,6 +35,16 @@ impl Children {
                 }
                 rnix::SyntaxElement::Token(token) => {
                     match token.kind() {
+                        rnix::SyntaxKind::TOKEN_COMMENT => {
+                            children.push(Child {
+                                element: crate::builder::make_isolated_token(
+                                    rnix::SyntaxKind::TOKEN_COMMENT,
+                                    &dedent_comment(&pos, token.text()),
+                                )
+                                .into(),
+                                pos:     pos.clone(),
+                            });
+                        }
                         rnix::SyntaxKind::TOKEN_WHITESPACE => {
                             if with_newlines
                                 && crate::utils::count_newlines(token.text())
@@ -127,10 +137,9 @@ impl Children {
     pub fn drain_comment<F: FnMut(String)>(&mut self, mut callback: F) {
         if let Some(child) = self.peek_next() {
             if let rnix::SyntaxKind::TOKEN_COMMENT = child.element.kind() {
-                callback(dedent_comment(
-                    &child.pos,
-                    child.element.into_token().unwrap().text(),
-                ));
+                callback(
+                    child.element.into_token().unwrap().text().to_string(),
+                );
                 self.move_next();
             }
         }
@@ -140,10 +149,9 @@ impl Children {
         while let Some(child) = self.peek_next() {
             match child.element.kind() {
                 rnix::SyntaxKind::TOKEN_COMMENT => {
-                    callback(dedent_comment(
-                        &child.pos,
-                        child.element.into_token().unwrap().text(),
-                    ));
+                    callback(
+                        child.element.into_token().unwrap().text().to_string(),
+                    );
                     self.move_next();
                 }
                 _ => {
@@ -160,10 +168,9 @@ impl Children {
         while let Some(child) = self.peek_next() {
             match child.element.kind() {
                 rnix::SyntaxKind::TOKEN_COMMENT => {
-                    callback(DrainCommentOrNewline::Comment(dedent_comment(
-                        &child.pos,
-                        child.element.into_token().unwrap().text(),
-                    )));
+                    callback(DrainCommentOrNewline::Comment(
+                        child.element.into_token().unwrap().text().to_string(),
+                    ));
                     self.move_next();
                 }
                 rnix::SyntaxKind::TOKEN_WHITESPACE => {