diff --git a/src/library/markup.rs b/src/library/markup.rs
index 12a14d142..2fb38193f 100644
--- a/src/library/markup.rs
+++ b/src/library/markup.rs
@@ -116,9 +116,9 @@ pub fn heading(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
         ctx.state.font.strong = true;
 
         body.exec(ctx);
-        ctx.push_parbreak();
-
         ctx.state = snapshot;
+
+        ctx.push_parbreak();
     })
 }
 
@@ -154,19 +154,17 @@ pub fn raw(ctx: &mut EvalContext, args: &mut FuncArgs) -> Value {
     let block = args.get(ctx, RawNode::BLOCK).unwrap_or(false);
 
     Value::template(Node::RAW, move |ctx| {
-        let snapshot = ctx.state.clone();
-
         if block {
             ctx.push_parbreak();
         }
 
+        let snapshot = ctx.state.clone();
         ctx.set_monospace();
         ctx.push_text(&text);
+        ctx.state = snapshot;
 
         if block {
             ctx.push_parbreak();
         }
-
-        ctx.state = snapshot;
     })
 }
diff --git a/tests/ref/markup/heading.png b/tests/ref/markup/heading.png
index 515788f31..f95b8c2cd 100644
Binary files a/tests/ref/markup/heading.png and b/tests/ref/markup/heading.png differ
diff --git a/tests/typ/markup/strong.typ b/tests/typ/markup/strong.typ
index 6a6fc04a7..b487d06d1 100644
--- a/tests/typ/markup/strong.typ
+++ b/tests/typ/markup/strong.typ
@@ -18,5 +18,6 @@ Partly str*ength*ened.
 *, *!
 
 #let strong = 123
+
 // Error: 1-2 expected function, found integer
 *