3 files changed, 17 insertions, 4 deletions
diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp
index e1acaee0..bfc98c06 100644
--- a/src/ui/controls/TextBox.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -28,6 +28,7 @@ TextBox::TextBox()
   scroll_render_object_->SetAttachedControl(this);
   text_render_object_->SetAttachedControl(this);
   text_render_object_->SetMinSize(Size{100, 24});
+  text_render_object_->SetMeasureIncludingTrailingSpace(true);
 
   service_ = std::make_unique<TextHostControlService>(this);
   service_->SetEnabled(true);
diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp
index 9faab622..06092d52 100644
--- a/src/ui/render/TextRenderObject.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -57,7 +57,8 @@ std::shared_ptr<platform::graphics::IFont> TextRenderObject::GetFont() const {
   return text_layout_->GetFont();
 }
 
-void TextRenderObject::SetFont(std::shared_ptr<platform::graphics::IFont> font) {
+void TextRenderObject::SetFont(
+    std::shared_ptr<platform::graphics::IFont> font) {
   Expects(font);
   text_layout_->SetFont(std::move(font));
 }
@@ -154,6 +155,12 @@ Rect TextRenderObject::GetCaretRect() {
   return rect;
 }
 
+void TextRenderObject::SetMeasureIncludingTrailingSpace(bool including) {
+  if (is_measure_including_trailing_space_ == including) return;
+  is_measure_including_trailing_space_ = including;
+  InvalidateLayout();
+}
+
 RenderObject* TextRenderObject::HitTest(const Point& point) {
   const auto padding_rect = GetPaddingRect();
   return padding_rect.IsPointInside(point) ? this : nullptr;
@@ -185,7 +192,9 @@ Size TextRenderObject::OnMeasureContent(const MeasureRequirement& requirement,
   text_layout_->SetMaxWidth(measure_width);
   text_layout_->SetMaxHeight(std::numeric_limits<float>::max());
 
-  const auto text_size = text_layout_->GetTextBounds().GetSize();
+  const auto text_size =
+      text_layout_->GetTextBounds(is_measure_including_trailing_space_)
+          .GetSize();
   auto result = text_size;
 
   if (requirement.max.width.IsSpecified() &&
diff --git a/src/win/graphics/direct/TextLayout.cpp b/src/win/graphics/direct/TextLayout.cpp
index 0c6e797f..0b3c68ca 100644
--- a/src/win/graphics/direct/TextLayout.cpp
+++ b/src/win/graphics/direct/TextLayout.cpp
@@ -58,10 +58,13 @@ void DWriteTextLayout::SetMaxHeight(float max_height) {
   ThrowIfFailed(text_layout_->SetMaxHeight(max_height_));
 }
 
-Rect DWriteTextLayout::GetTextBounds() {
+Rect DWriteTextLayout::GetTextBounds(bool includingTrailingSpace) {
   DWRITE_TEXT_METRICS metrics;
   ThrowIfFailed(text_layout_->GetMetrics(&metrics));
-  return Rect{metrics.left, metrics.top, metrics.width, metrics.height};
+  return Rect{metrics.left, metrics.top,
+              includingTrailingSpace ? metrics.widthIncludingTrailingWhitespace
+                                     : metrics.width,
+              metrics.height};
 }
 
 std::vector<Rect> DWriteTextLayout::TextRangeRect(