diff --git a/src/kits/interface/View.cpp b/src/kits/interface/View.cpp
index be59eed93d..46c28bcc69 100644
--- a/src/kits/interface/View.cpp
+++ b/src/kits/interface/View.cpp
@@ -2129,8 +2129,6 @@ BView::SetFont(const BFont* font, uint32 mask)
 
 	fState->font_flags |= mask;
 
-	InvalidateLayout();
-
 	if (fOwner) {
 		check_lock();
 		do_owner_check();
diff --git a/src/tests/kits/interface/layout/widget_layout_test/ButtonTest.cpp b/src/tests/kits/interface/layout/widget_layout_test/ButtonTest.cpp
index 7002b8087a..a2c3392ab3 100644
--- a/src/tests/kits/interface/layout/widget_layout_test/ButtonTest.cpp
+++ b/src/tests/kits/interface/layout/widget_layout_test/ButtonTest.cpp
@@ -126,5 +126,7 @@ ButtonTest::_SetButtonFont(bool bigFont)
 
 		// set font
 		fButton->SetFont(bigFont ? fBigFont : fDefaultFont);
+		fButton->InvalidateLayout();
+		fButton->Invalidate();
 	}
 }