diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index da3eb452a1..f076e32841 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -191,10 +191,9 @@ public:
 		this->BuildVehicleList();
 		this->SortVehicleList();
 
-		this->owner = vli.company;
 		this->groups.ForceRebuild();
 		this->groups.NeedResort();
-		this->BuildGroupList(this->owner);
+		this->BuildGroupList(vli.company);
 		this->groups.Sort(&GroupNameSorter);
 
 		this->GetWidget<NWidgetCore>(GRP_WIDGET_CAPTION)->widget_data = STR_VEHICLE_LIST_TRAIN_CAPTION + this->vli.vtype;
@@ -206,6 +205,7 @@ public:
 		this->GetWidget<NWidgetCore>(GRP_WIDGET_REPLACE_PROTECTION)->widget_data += this->vli.vtype;
 
 		this->FinishInitNested(desc, window_number);
+		this->owner = vli.company;
 	}
 
 	~VehicleGroupWindow()
@@ -301,7 +301,7 @@ public:
 		this->BuildVehicleList();
 		this->SortVehicleList();
 
-		this->BuildGroupList(owner);
+		this->BuildGroupList(this->owner);
 		this->groups.Sort(&GroupNameSorter);
 
 		this->group_sb->SetCount(this->groups.Length());