diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 9ddfa890ba..e742e07b34 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -2468,7 +2468,7 @@ static void ShowBuildTrainDepotPicker(Window *parent)
 }
 
 struct BuildRailWaypointWindow : PickerWindowBase {
-	using WaypointList = GUIList<uint>;
+	using WaypointList = GUIList<uint16_t>;
 	static const uint FILTER_LENGTH = 20;
 
 	const StationClass *waypoints;
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index eca3387646..95b7f192b2 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -1967,7 +1967,7 @@ static void ShowRVStationPicker(Window *parent, RoadStopType rs)
 }
 
 struct BuildRoadWaypointWindow : PickerWindowBase {
-	using WaypointList = GUIList<uint>;
+	using WaypointList = GUIList<uint16_t>;
 	static const uint FILTER_LENGTH = 20;
 
 	const RoadStopClass *waypoints;