diff --git a/src/generation/generate.rs b/src/generation/generate.rs
index f978a04b..52c19481 100644
--- a/src/generation/generate.rs
+++ b/src/generation/generate.rs
@@ -3949,16 +3949,16 @@ fn gen_as_jsx_expr_container(expr: Node, inner_items: PrintItems, context: &mut
   if surround_with_new_lines {
     items.push_signal(Signal::NewLine);
     items.push_signal(Signal::StartIndent);
-  } else if surround_with_space {
-    items.push_space();
-  }
-  items.extend(inner_items);
-  if surround_with_new_lines {
+    items.extend(inner_items);
     items.extend(gen_trailing_comments_as_statements(&expr.range(), context));
     items.push_signal(Signal::NewLine);
     items.push_signal(Signal::FinishIndent);
   } else if surround_with_space {
-    items.push_space();
+    items.push_signal(Signal::SpaceOrNewLine);
+    items.extend(inner_items);
+    items.push_condition(if_false("addSpaceIfNotStartOfLine", condition_resolvers::is_start_of_line(), " ".into()));
+  } else {
+    items.extend(inner_items);
   }
   items.push_sc(sc!("}"));
 
diff --git a/tests/specs/jsx/JsxExpressionContainer/JsxExpressionContainer_SpaceSurroundingExpression_True.txt b/tests/specs/jsx/JsxExpressionContainer/JsxExpressionContainer_SpaceSurroundingExpression_True.txt
index 15a7b4a9..32ba7728 100644
--- a/tests/specs/jsx/JsxExpressionContainer/JsxExpressionContainer_SpaceSurroundingExpression_True.txt
+++ b/tests/specs/jsx/JsxExpressionContainer/JsxExpressionContainer_SpaceSurroundingExpression_True.txt
@@ -5,3 +5,193 @@ const t = <test other={   4  } />;
 
 [expect]
 const t = <test other={ 4 } />;
+
+== should not add extra space before closing brace in nested JSX ==
+<OuterComponent
+    menuTarget={
+        <InnerComponent
+            item={ content }
+            className={ styles.someClass }
+        />
+    }
+/>;
+
+[expect]
+<OuterComponent
+    menuTarget={
+        <InnerComponent
+            item={ content }
+            className={ styles.someClass }
+        />
+    }
+/>;
+
+== should not add extra space in similar nested JSX pattern ==
+<OuterComponent
+    prop={
+        <InnerComponent
+            attr={ value }
+            className={ styles.someClass }
+        />
+    }
+    otherProp="value"
+/>;
+
+[expect]
+<OuterComponent
+    prop={
+        <InnerComponent
+            attr={ value }
+            className={ styles.someClass }
+        />
+    }
+    otherProp="value"
+/>;
+
+== should handle deeply nested JSX without extra spaces ==
+<OuterComponent
+    complexProp={
+        <MiddleComponent
+            nestedProp={
+                <InnerComponent
+                    innerAttr={ someValue }
+                />
+            }
+        />
+    }
+/>;
+
+[expect]
+<OuterComponent
+    complexProp={
+        <MiddleComponent
+            nestedProp={
+                <InnerComponent
+                    innerAttr={ someValue }
+                />
+            }
+        />
+    }
+/>;
+
+== expression braces on the same line as a component ==
+<Component>{contents}</Component>;
+
+[expect]
+<Component>{ contents }</Component>;
+
+== expression braces on the same line ==
+return (<Component>
+{contents}</Component>);
+
+[expect]
+return (
+    <Component>
+        { contents }
+    </Component>
+);
+
+== expression braces across multiple lines ==
+return <Component>{<div><div /></div>}</Component>;
+
+[expect]
+return (
+    <Component>
+        {
+            <div>
+                <div />
+            </div>
+        }
+    </Component>
+);
+
+== open braces followed by open braces ==
+return (
+<Component            style={{
+              color: "blue",
+            }} />
+);
+
+[expect]
+return (
+    <Component
+        style={ {
+            color: "blue",
+        } }
+    />
+);
+
+== open braces with compound expressions ==
+<>
+      {groups.length === 0 && (
+        <div className={ styles.Group }>
+          <p>text</p>
+        </div>
+      )}
+</>;
+
+[expect]
+<>
+    { groups.length === 0 && (
+        <div className={ styles.Group }>
+            <p>text</p>
+        </div>
+    ) }
+</>;
+
+== open braces with arrow function ==
+<>
+            {data.map((data, index) => (
+              <div key={ index } className={ styles.item }>
+                <strong>{ data.label }:</strong> { data.text }
+              </div>
+            ))}
+</>;
+
+[expect]
+<>
+    { data.map((data, index) => (
+        <div key={ index } className={ styles.item }>
+            <strong>{ data.label }:</strong> { data.text }
+        </div>
+    )) }
+</>;
+
+== more varied formatting ==
+              <OuterComponent
+	    inner={
+  	    <InnerComponent item={content  }
+            className={styles.someClass}
+            foo={a }
+                    bar={        b}
+          />
+		}
+            />
+
+[expect]
+<OuterComponent
+    inner={ <InnerComponent item={ content } className={ styles.someClass } foo={ a } bar={ b } /> }
+/>;
+
+== more varied formatting across lines ==
+              <OuterComponent
+        inner={
+          <InnerComponent item={content  }
+            className={styles.someClass}
+            foo={areallylongidentifier}
+                    bar={        anotherreallylongidentifier}
+          />
+		 }
+            />
+
+[expect]
+<OuterComponent
+    inner={
+        <InnerComponent
+            item={ content }
+            className={ styles.someClass }
+            foo={ areallylongidentifier }
+            bar={ anotherreallylongidentifier }
+        />
+    }
+/>;