diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 4ca6ad5383..874a479e6f 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -730,8 +730,8 @@ static void ToolbarVehicleClick(Window *w, VehicleType veh)
 {
 	int dis = ~0;
 
-	for (const Vehicle *v : Vehicle::Iterate()) {
-		if (v->type == veh && v->IsPrimaryVehicle()) ClrBit(dis, v->owner);
+	for (const Company *c : Company::Iterate()) {
+		if (!c->group_all[veh].vehicle_list.empty()) ClrBit(dis, c->index);
 	}
 	PopupMainCompanyToolbMenu(w, WID_TN_VEHICLE_START + veh, dis);
 }