diff --git a/Terminal.Gui/View/Layout/ViewLayout.cs b/Terminal.Gui/View/Layout/ViewLayout.cs
index 26da0b4b3..c41c5e12c 100644
--- a/Terminal.Gui/View/Layout/ViewLayout.cs
+++ b/Terminal.Gui/View/Layout/ViewLayout.cs
@@ -689,8 +689,6 @@ public partial class View
 
         LayoutAdornments ();
 
-        //SetTextFormatterSize ();
-
         // Sort out the dependencies of the X, Y, Width, Height properties
         HashSet<View> nodes = new ();
         HashSet<(View, View)> edges = new ();
@@ -719,7 +717,7 @@ public partial class View
 
     private void LayoutSubview (View v, Size contentSize)
     {
-        // BUGBUG: Calling SetRelativeLayout before LayoutSubviews is problematic. Need to resolve.
+        // Note, SetRelativeLayout calls SetTextFormatterSize
         v.SetRelativeLayout (contentSize);
         v.LayoutSubviews ();
         v.LayoutNeeded = false;
diff --git a/Terminal.Gui/View/ViewText.cs b/Terminal.Gui/View/ViewText.cs
index 9ae02d2db..0e43dba94 100644
--- a/Terminal.Gui/View/ViewText.cs
+++ b/Terminal.Gui/View/ViewText.cs
@@ -157,12 +157,9 @@ public partial class View
     /// </remarks>
     protected virtual void UpdateTextFormatterText ()
     {
-        if (TextFormatter is { })
-        {
-            TextFormatter.Text = _text;
-            TextFormatter.Width = null;
-            TextFormatter.Height = null;
-        }
+        TextFormatter.Text = _text;
+        TextFormatter.Width = null;
+        TextFormatter.Height = null;
     }
 
     /// <summary>