diff --git a/src/formatter/formatTreeNode.js b/src/formatter/formatTreeNode.js
index 0a24d7909..0d5ea3429 100644
--- a/src/formatter/formatTreeNode.js
+++ b/src/formatter/formatTreeNode.js
@@ -20,11 +20,11 @@ const escape = (s: string) => {
 const preserveTrailingSpace = (s: string) => {
   let result = s;
   if (result.endsWith(' ')) {
-    result = result.replace(/^(\S*)(\s*)$/, "$1{'$2'}");
+    result = result.replace(/^(.*?)(\s+)$/, "$1{'$2'}");
   }
 
   if (result.startsWith(' ')) {
-    result = result.replace(/^(\s*)(\S*)$/, "{'$1'}$2");
+    result = result.replace(/^(\s+)(.*)$/, "{'$1'}$2");
   }
 
   return result;
diff --git a/src/index.spec.js b/src/index.spec.js
index a88060855..c2b4c288c 100644
--- a/src/index.spec.js
+++ b/src/index.spec.js
@@ -559,19 +559,19 @@ describe('reactElementToJSXString(ReactElement)', () => {
     );
   });
 
-  it('reactElementToJSXString(<div>\nfoo <span>bar</span> baz\n</div>)', () => {
+  it('reactElementToJSXString(<div>\nfoo bar <span> baz </span> qux quux\n</div>)', () => {
     expect(
       reactElementToJSXString(
         <div>
-          foo <span>bar</span> baz
+          foo bar <span> baz </span> qux quux
         </div>
       )
     ).toEqual(`<div>
-  foo{' '}
+  foo bar{' '}
   <span>
-    bar
+    {' '}baz{' '}
   </span>
-  {' '}baz
+  {' '}qux quux
 </div>`);
   });