diff --git a/src/SourceGenerators/System.Xaml/System.Xaml/XamlXmlReader.cs b/src/SourceGenerators/System.Xaml/System.Xaml/XamlXmlReader.cs
index acb36439edcf7475d0ce0285032337990951f4cf..da125380a4afa2485936a23b5345134888499651 100644
--- a/src/SourceGenerators/System.Xaml/System.Xaml/XamlXmlReader.cs
+++ b/src/SourceGenerators/System.Xaml/System.Xaml/XamlXmlReader.cs
@@ -666,6 +666,17 @@ namespace Uno.Xaml
 
 					yield return ni;
 				}
+				var currentNodeType = r.NodeType;
+				var currentNodeValue = r.Value;
+				var nextNodeType = r.MoveToContent();
+				if (currentNodeType == XmlNodeType.Whitespace && nextNodeType != XmlNodeType.EndElement)
+				{
+					yield return Node(XamlNodeType.Value, " ");
+				}
+				if (currentNodeType == XmlNodeType.SignificantWhitespace)
+				{
+					yield return Node(XamlNodeType.Value, currentNodeValue);
+				}
 			}
 		}