diff --git a/build_vehicle_gui.c b/build_vehicle_gui.c
index 4d7f7542a0..b1c82c95f4 100644
--- a/build_vehicle_gui.c
+++ b/build_vehicle_gui.c
@@ -335,8 +335,6 @@ static void DrawBuildAircraftWindow(Window *w)
 
 	SetWindowWidgetDisabledState(w, BUILD_VEHICLE_WIDGET_BUILD, w->window_number == 0);
 
-	GenerateBuildList(w);
-
 	if (bv->sel_engine != INVALID_ENGINE) {
 		int i;
 		bool found = false;
@@ -429,6 +427,7 @@ static void NewAircraftWndProc(Window *w, WindowEvent *e)
 
 	switch (e->event) {
 		case WE_INVALIDATE_DATA:
+			GenerateBuildList(w);
 			SetWindowDirty(w);
 			break;