diff --git a/Terminal.Gui/Views/CheckBox.cs b/Terminal.Gui/Views/CheckBox.cs
index 0535f5f43..62375ccd5 100644
--- a/Terminal.Gui/Views/CheckBox.cs
+++ b/Terminal.Gui/Views/CheckBox.cs
@@ -20,7 +20,7 @@ public class CheckBox : View
         _charChecked = Glyphs.Checked;
         _charUnChecked = Glyphs.UnChecked;
 
-        Height = 1;
+        Height = Dim.Auto (Dim.DimAutoStyle.Text);
         Width = Dim.Auto (Dim.DimAutoStyle.Text);
 
         CanFocus = true;
diff --git a/Terminal.Gui/Views/TextField.cs b/Terminal.Gui/Views/TextField.cs
index d38b0d40a..d9152a40d 100644
--- a/Terminal.Gui/Views/TextField.cs
+++ b/Terminal.Gui/Views/TextField.cs
@@ -33,7 +33,7 @@ public class TextField : View
         CaptionColor = new Color (Color.DarkGray);
         ReadOnly = false;
         Autocomplete = new TextFieldAutocomplete ();
-        Height = 1;
+        Height = 1; // BUGBUG: This should either be Dim.Auto or we should enforce ContentSize.Height = 1
 
         CanFocus = true;
         CursorVisibility = CursorVisibility.Default;
diff --git a/UnitTests/Views/CheckBoxTests.cs b/UnitTests/Views/CheckBoxTests.cs
index 2854634b5..ea1c8fab3 100644
--- a/UnitTests/Views/CheckBoxTests.cs
+++ b/UnitTests/Views/CheckBoxTests.cs
@@ -137,7 +137,7 @@ public class CheckBoxTests
     {
         var ckb = new CheckBox ();
         Assert.True (ckb.Width is Dim.DimAuto);
-        Assert.Equal (Dim.Sized (1), ckb.Height);
+        Assert.True (ckb.Height is Dim.DimAuto);
         Assert.False (ckb.Checked);
         Assert.False (ckb.AllowNullChecked);
         Assert.Equal (string.Empty, ckb.Text);
@@ -147,7 +147,7 @@ public class CheckBoxTests
 
         ckb = new CheckBox { Text = "Test", Checked = true };
         Assert.True (ckb.Width is Dim.DimAuto);
-        Assert.Equal (Dim.Sized (1), ckb.Height);
+        Assert.True (ckb.Height is Dim.DimAuto);
         Assert.True (ckb.Checked);
         Assert.False (ckb.AllowNullChecked);
         Assert.Equal ("Test", ckb.Text);
@@ -157,7 +157,7 @@ public class CheckBoxTests
 
         ckb = new CheckBox { Text = "Test", X = 1, Y = 2 };
         Assert.True (ckb.Width is Dim.DimAuto);
-        Assert.Equal (Dim.Sized (1), ckb.Height);
+        Assert.True (ckb.Height is Dim.DimAuto);
         Assert.False (ckb.Checked);
         Assert.False (ckb.AllowNullChecked);
         Assert.Equal ("Test", ckb.Text);
@@ -167,7 +167,7 @@ public class CheckBoxTests
 
         ckb = new CheckBox { Text = "Test", X = 3, Y = 4, Checked = true };
         Assert.True (ckb.Width is Dim.DimAuto);
-        Assert.Equal (Dim.Sized (1), ckb.Height);
+        Assert.True (ckb.Height is Dim.DimAuto);
         Assert.True (ckb.Checked);
         Assert.False (ckb.AllowNullChecked);
         Assert.Equal ("Test", ckb.Text);