diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index b12d450aca..c8f800a8d1 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -2170,8 +2170,12 @@ BTextView::SetTextRect(BRect rect)
 	if (rect == fTextRect)
 		return;
 
-	if (fWrap)
-		fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), rect);
+	if (!fWrap) {
+		rect.right = Bounds().right - fLayoutData->rightInset;
+		rect.bottom = Bounds().bottom - fLayoutData->bottomInset;
+	}
+
+	fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), rect);
 
 	_ResetTextRect();
 }