diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index e21a6f88ae..dd437a427a 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -4926,8 +4926,6 @@ Train* CmdBuildVirtualRailVehicle(EngineID eid, bool lax_engine_check, StringID
 	v->SetFrontEngine();
 	v->SetEngine();
 
-	v->UpdateViewport(true, false);
-
 	if (rvi->railveh_type == RAILVEH_MULTIHEAD) {
 		AddRearEngineToMultiheadedTrain(v);
 	} else {
@@ -4939,6 +4937,8 @@ Train* CmdBuildVirtualRailVehicle(EngineID eid, bool lax_engine_check, StringID
 		train_part->SetVirtual();
 	}
 
+	v->UpdateViewport(true, false);
+
 	v->ConsistChanged(CCF_ARRANGE);
 
 	CheckConsistencyOfArticulatedVehicle(v);