diff --git a/misc_gui.c b/misc_gui.c
index b5ae37ffd5..7fdfba6799 100644
--- a/misc_gui.c
+++ b/misc_gui.c
@@ -615,7 +615,7 @@ void ShowFeederIncomeAnimation(int x, int y, int z, int32 cost)
 	AddTextEffect(STR_FEEDER, pt.x, pt.y, 0x250);
 }
 
-static Widget _tooltips_widgets[] = {
+static const Widget _tooltips_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   199,     0,    31, 0x0, STR_NULL},
 {   WIDGETS_END},
 };
@@ -665,9 +665,6 @@ void GuiShowTooltips(StringID string_id)
 		right = 200;
 	}
 
-	_tooltips_widgets[0].right = right;
-	_tooltips_widgets[0].bottom = bottom;
-
 	y = _cursor.pos.y + 30;
 	if (y < 22) y = 22;
 
@@ -681,6 +678,8 @@ void GuiShowTooltips(StringID string_id)
 	w = AllocateWindow(x, y, right, bottom, TooltipsWndProc, WC_TOOLTIPS, _tooltips_widgets);
 	WP(w,tooltips_d).string_id = string_id;
 	w->flags4 &= ~WF_WHITE_BORDER_MASK;
+	w->widget[0].right = right;
+	w->widget[0].bottom = bottom;
 }
 
 
diff --git a/train_gui.c b/train_gui.c
index 971d1d467d..bc2984805b 100644
--- a/train_gui.c
+++ b/train_gui.c
@@ -879,7 +879,7 @@ static void ShowRailVehicleRefitWindow(Vehicle *v)
 	WP(w,refit_d).sel = -1;
 }
 
-static Widget _train_view_widgets[] = {
+static const Widget _train_view_widgets[] = {
 { WWT_CLOSEBOX,   RESIZE_NONE,  14,   0,  10,   0,  13, STR_00C5, STR_018B_CLOSE_WINDOW },
 { WWT_CAPTION,    RESIZE_RIGHT, 14,  11, 237,   0,  13, STR_882E, STR_018C_WINDOW_TITLE_DRAG_THIS },
 { WWT_STICKYBOX,  RESIZE_LR,    14, 238, 249,   0,  13, 0x0,      STR_STICKY_BUTTON },