diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 6b1e9f61c0..8430f35ab9 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -2277,7 +2277,8 @@ struct BuildRailWaypointWindow : PickerWindowBase {
 		this->FinishInitNested(TRANSPORT_RAIL);
 
 		matrix->SetCount(_waypoint_count);
-		matrix->SetClicked(_cur_waypoint_type < _waypoint_count ? _cur_waypoint_type : 0);
+		if (_cur_waypoint_type >= _waypoint_count) _cur_waypoint_type = 0;
+		matrix->SetClicked(_cur_waypoint_type);
 	}
 
 	void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) override