diff --git a/src/window.cpp b/src/window.cpp
index db284ffadf..31e9f7fccf 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1807,9 +1807,12 @@ void InitWindowSystem()
 	_scrolling_viewport = false;
 	_mouse_hovering = false;
 
+	SetupWidgetDimensions();
 	NWidgetLeaf::InvalidateDimensionCache(); // Reset cached sizes of several widgets.
 	NWidgetScrollbar::InvalidateDimensionCache();
 
+	InitDepotWindowBlockSizes();
+
 	ShowFirstError();
 }