diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 6506df8e92..c801a91a75 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -49,8 +49,8 @@
 #include "safeguards.h"
 
 
-BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END];
-Sorting _sorting[BaseVehicleListWindow::GB_END];
+std::array<std::array<BaseVehicleListWindow::GroupBy, VEH_COMPANY_END>, VLT_END> _grouping{};
+std::array<Sorting, BaseVehicleListWindow::GB_END> _sorting{};
 
 static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNumberSorter;
 static BaseVehicleListWindow::VehicleIndividualSortFunction VehicleNameSorter;
@@ -1553,8 +1553,8 @@ static bool VehicleTimetableDelaySorter(const Vehicle * const &a, const Vehicle
 
 void InitializeGUI()
 {
-	MemSetT(&_grouping, 0);
-	MemSetT(&_sorting, 0);
+	_grouping = {};
+	_sorting = {};
 }
 
 /**
diff --git a/src/vehicle_gui_base.h b/src/vehicle_gui_base.h
index 5d548b8493..d7e3cdb388 100644
--- a/src/vehicle_gui_base.h
+++ b/src/vehicle_gui_base.h
@@ -164,7 +164,7 @@ struct Sorting {
 	Listing train;
 };
 
-extern BaseVehicleListWindow::GroupBy _grouping[VLT_END][VEH_COMPANY_END];
-extern Sorting _sorting[BaseVehicleListWindow::GB_END];
+extern std::array<std::array<BaseVehicleListWindow::GroupBy, VEH_COMPANY_END>, VLT_END> _grouping;
+extern std::array<Sorting, BaseVehicleListWindow::GB_END> _sorting;
 
 #endif /* VEHICLE_GUI_BASE_H */