diff --git a/src/openrct2/windows/ride.c b/src/openrct2/windows/ride.c
index 4bf9f11186..ba0a509a1b 100644
--- a/src/openrct2/windows/ride.c
+++ b/src/openrct2/windows/ride.c
@@ -381,48 +381,136 @@ static rct_widget *window_ride_page_widgets[] = {
 	window_ride_customer_widgets
 };
 
-#define MAIN_RIDE_ENABLED_WIDGETS (1ULL << WIDX_CLOSE) | (1ULL << WIDX_TAB_1) | (1ULL << WIDX_TAB_2) | (1ULL << WIDX_TAB_3) | (1ULL << WIDX_TAB_4) | \
-	(1ULL << WIDX_TAB_5) | (1ULL << WIDX_TAB_6) | (1ULL << WIDX_TAB_7) | (1ULL << WIDX_TAB_8) | (1ULL << WIDX_TAB_9) | (1ULL << WIDX_TAB_10)
+#define MAIN_RIDE_ENABLED_WIDGETS \
+	(1ULL << WIDX_CLOSE) | \
+	(1ULL << WIDX_TAB_1) | \
+	(1ULL << WIDX_TAB_2) | \
+	(1ULL << WIDX_TAB_3) | \
+	(1ULL << WIDX_TAB_4) | \
+	(1ULL << WIDX_TAB_5) | \
+	(1ULL << WIDX_TAB_6) | \
+	(1ULL << WIDX_TAB_7) | \
+	(1ULL << WIDX_TAB_8) | \
+	(1ULL << WIDX_TAB_9) | \
+	(1ULL << WIDX_TAB_10)
 
 const uint64 window_ride_page_enabled_widgets[] = {
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_VIEW) | (1ULL << WIDX_VIEW_DROPDOWN) | (1ULL << WIDX_OPEN) | (1ULL << WIDX_CONSTRUCTION) | (1ULL << WIDX_RENAME) |
-		(1ULL << WIDX_LOCATE) | (1ULL << WIDX_DEMOLISH) | (1ULL << WIDX_CLOSE_LIGHT) | (1ULL << WIDX_TEST_LIGHT) | (1ULL << WIDX_OPEN_LIGHT) | (1ULL << WIDX_RIDE_TYPE) |
-		(1ULL << WIDX_RIDE_TYPE_INCREASE) | (1ULL << WIDX_RIDE_TYPE_DECREASE) | (1ULL << WIDX_RIDE_TYPE_APPLY),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_VEHICLE_TYPE) | (1ULL << WIDX_VEHICLE_TYPE_DROPDOWN) | (1ULL << WIDX_VEHICLE_TRAINS) | (1ULL << WIDX_VEHICLE_TRAINS_INCREASE) |
-		(1ULL << WIDX_VEHICLE_TRAINS_DECREASE) | (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN) | (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE) | (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_MODE_TWEAK_INCREASE) | (1ULL << WIDX_MODE_TWEAK_DECREASE) | (1ULL << WIDX_LIFT_HILL_SPEED_INCREASE) |
-		(1ULL << WIDX_LIFT_HILL_SPEED_DECREASE) | (1ULL << WIDX_LOAD_CHECKBOX) | (1ULL << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX) | (1ULL << WIDX_MINIMUM_LENGTH_CHECKBOX) |
-		(1ULL << WIDX_MINIMUM_LENGTH_INCREASE) | (1ULL << WIDX_MINIMUM_LENGTH_DECREASE) | (1ULL << WIDX_MAXIMUM_LENGTH_CHECKBOX) | (1ULL << WIDX_MAXIMUM_LENGTH_INCREASE) |
-		(1ULL << WIDX_MAXIMUM_LENGTH_DECREASE) | (1ULL << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX) | (1ULL << WIDX_MODE) | (1ULL << WIDX_MODE_DROPDOWN) |
-		(1ULL << WIDX_LOAD) | (1ULL << WIDX_LOAD_DROPDOWN) | (1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE) | (1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_INSPECTION_INTERVAL) | (1ULL << WIDX_INSPECTION_INTERVAL_DROPDOWN) | (1ULL << WIDX_LOCATE_MECHANIC) |
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_VIEW) |
+		(1ULL << WIDX_VIEW_DROPDOWN) |
+		(1ULL << WIDX_OPEN) |
+		(1ULL << WIDX_CONSTRUCTION) |
+		(1ULL << WIDX_RENAME) |
+		(1ULL << WIDX_LOCATE) |
+		(1ULL << WIDX_DEMOLISH) |
+		(1ULL << WIDX_CLOSE_LIGHT) |
+		(1ULL << WIDX_TEST_LIGHT) |
+		(1ULL << WIDX_OPEN_LIGHT) |
+		(1ULL << WIDX_RIDE_TYPE) |
+		(1ULL << WIDX_RIDE_TYPE_INCREASE) |
+		(1ULL << WIDX_RIDE_TYPE_DECREASE) |
+		(1ULL << WIDX_RIDE_TYPE_APPLY),
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_VEHICLE_TYPE) |
+		(1ULL << WIDX_VEHICLE_TYPE_DROPDOWN) |
+		(1ULL << WIDX_VEHICLE_TRAINS) |
+		(1ULL << WIDX_VEHICLE_TRAINS_INCREASE) |
+		(1ULL << WIDX_VEHICLE_TRAINS_DECREASE) |
+		(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN) |
+		(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE) |
+		(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE),
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_MODE_TWEAK_INCREASE) |
+		(1ULL << WIDX_MODE_TWEAK_DECREASE) |
+		(1ULL << WIDX_LIFT_HILL_SPEED_INCREASE) |
+		(1ULL << WIDX_LIFT_HILL_SPEED_DECREASE) |
+		(1ULL << WIDX_LOAD_CHECKBOX) |
+		(1ULL << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX) |
+		(1ULL << WIDX_MINIMUM_LENGTH_CHECKBOX) |
+		(1ULL << WIDX_MINIMUM_LENGTH_INCREASE) |
+		(1ULL << WIDX_MINIMUM_LENGTH_DECREASE) |
+		(1ULL << WIDX_MAXIMUM_LENGTH_CHECKBOX) |
+		(1ULL << WIDX_MAXIMUM_LENGTH_INCREASE) |
+		(1ULL << WIDX_MAXIMUM_LENGTH_DECREASE) |
+		(1ULL << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX) |
+		(1ULL << WIDX_MODE) |
+		(1ULL << WIDX_MODE_DROPDOWN) |
+		(1ULL << WIDX_LOAD) |
+		(1ULL << WIDX_LOAD_DROPDOWN) |
+		(1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE) |
+		(1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE),
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_INSPECTION_INTERVAL) |
+		(1ULL << WIDX_INSPECTION_INTERVAL_DROPDOWN) |
+		(1ULL << WIDX_LOCATE_MECHANIC) |
 		(1ULL << WIDX_FORCE_BREAKDOWN),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_TRACK_COLOUR_SCHEME_DROPDOWN) | (1ULL << WIDX_TRACK_MAIN_COLOUR) | (1ULL << WIDX_TRACK_ADDITIONAL_COLOUR) |
-		(1ULL << WIDX_TRACK_SUPPORT_COLOUR) | (1ULL << WIDX_MAZE_STYLE) | (1ULL << WIDX_MAZE_STYLE_DROPDOWN) | (1ULL << WIDX_PAINT_INDIVIDUAL_AREA) |
-		(1ULL << WIDX_ENTRANCE_STYLE) | (1ULL << WIDX_ENTRANCE_STYLE_DROPDOWN) | (1ULL << WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN) | (1ULL << WIDX_VEHICLE_COLOUR_INDEX) |
-		(1ULL << WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN) | (1ULL << WIDX_VEHICLE_MAIN_COLOUR) | (1ULL << WIDX_VEHICLE_ADDITIONAL_COLOUR_1) | (1ULL << WIDX_VEHICLE_ADDITIONAL_COLOUR_2),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_PLAY_MUSIC) | (1ULL << WIDX_MUSIC) | (1ULL << WIDX_MUSIC_DROPDOWN),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_SAVE_TRACK_DESIGN) | (1ULL << WIDX_SELECT_NEARBY_SCENERY) | (1ULL << WIDX_RESET_SELECTION) | (1ULL << WIDX_SAVE_DESIGN) |
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_TRACK_COLOUR_SCHEME_DROPDOWN) |
+		(1ULL << WIDX_TRACK_MAIN_COLOUR) |
+		(1ULL << WIDX_TRACK_ADDITIONAL_COLOUR) |
+		(1ULL << WIDX_TRACK_SUPPORT_COLOUR) |
+		(1ULL << WIDX_MAZE_STYLE) |
+		(1ULL << WIDX_MAZE_STYLE_DROPDOWN) |
+		(1ULL << WIDX_PAINT_INDIVIDUAL_AREA) |
+		(1ULL << WIDX_ENTRANCE_STYLE) |
+		(1ULL << WIDX_ENTRANCE_STYLE_DROPDOWN) |
+		(1ULL << WIDX_VEHICLE_COLOUR_SCHEME_DROPDOWN) |
+		(1ULL << WIDX_VEHICLE_COLOUR_INDEX) |
+		(1ULL << WIDX_VEHICLE_COLOUR_INDEX_DROPDOWN) |
+		(1ULL << WIDX_VEHICLE_MAIN_COLOUR) |
+		(1ULL << WIDX_VEHICLE_ADDITIONAL_COLOUR_1) |
+		(1ULL << WIDX_VEHICLE_ADDITIONAL_COLOUR_2),
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_PLAY_MUSIC) |
+		(1ULL << WIDX_MUSIC) |
+		(1ULL << WIDX_MUSIC_DROPDOWN),
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_SAVE_TRACK_DESIGN) |
+		(1ULL << WIDX_SELECT_NEARBY_SCENERY) |
+		(1ULL << WIDX_RESET_SELECTION) |
+		(1ULL << WIDX_SAVE_DESIGN) |
 		(1ULL << WIDX_CANCEL_DESIGN),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_GRAPH_VELOCITY) | (1ULL << WIDX_GRAPH_ALTITUDE) | (1ULL << WIDX_GRAPH_VERTICAL) | (1ULL << WIDX_GRAPH_LATERAL),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_PRIMARY_PRICE_INCREASE) | (1ULL << WIDX_PRIMARY_PRICE_DECREASE) | (1ULL << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK) |
-		(1ULL << WIDX_SECONDARY_PRICE_INCREASE) | (1ULL << WIDX_SECONDARY_PRICE_DECREASE) | (1ULL << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK),
-	MAIN_RIDE_ENABLED_WIDGETS | (1ULL << WIDX_SHOW_GUESTS_THOUGHTS) | (1ULL << WIDX_SHOW_GUESTS_ON_RIDE) | (1ULL << WIDX_SHOW_GUESTS_QUEUING)
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_GRAPH_VELOCITY) |
+		(1ULL << WIDX_GRAPH_ALTITUDE) |
+		(1ULL << WIDX_GRAPH_VERTICAL) |
+		(1ULL << WIDX_GRAPH_LATERAL),
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_PRIMARY_PRICE_INCREASE) |
+		(1ULL << WIDX_PRIMARY_PRICE_DECREASE) |
+		(1ULL << WIDX_PRIMARY_PRICE_SAME_THROUGHOUT_PARK) |
+		(1ULL << WIDX_SECONDARY_PRICE_INCREASE) |
+		(1ULL << WIDX_SECONDARY_PRICE_DECREASE) |
+		(1ULL << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK),
+	MAIN_RIDE_ENABLED_WIDGETS |
+		(1ULL << WIDX_SHOW_GUESTS_THOUGHTS) |
+		(1ULL << WIDX_SHOW_GUESTS_ON_RIDE) |
+		(1ULL << WIDX_SHOW_GUESTS_QUEUING),
 };
 
 const uint64 window_ride_page_hold_down_widgets[] = {
 	0,
-	(1ULL << WIDX_VEHICLE_TRAINS) | (1ULL << WIDX_VEHICLE_TRAINS_INCREASE) | (1ULL << WIDX_VEHICLE_TRAINS_DECREASE) | (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN) |
-		(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE) | (1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE),
-	(1ULL << WIDX_MODE_TWEAK_INCREASE) | (1ULL << WIDX_MODE_TWEAK_DECREASE) | (1ULL << WIDX_LIFT_HILL_SPEED_INCREASE) | (1ULL << WIDX_LIFT_HILL_SPEED_DECREASE) |
-		(1ULL << WIDX_MINIMUM_LENGTH_INCREASE) | (1ULL << WIDX_MINIMUM_LENGTH_DECREASE) | (1ULL << WIDX_MAXIMUM_LENGTH_INCREASE) | (1ULL << WIDX_MAXIMUM_LENGTH_DECREASE) |
-		(1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_INCREASE) | (1ULL << WIDX_OPERATE_NUMBER_OF_CIRCUITS_DECREASE),
+	(1ULL << WIDX_VEHICLE_TRAINS_INCREASE) |
+		(1ULL << WIDX_VEHICLE_TRAINS_DECREASE) |
+		(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_INCREASE) |
+		(1ULL << WIDX_VEHICLE_CARS_PER_TRAIN_DECREASE),
+	(1ULL << WIDX_MODE_TWEAK_INCREASE) |
+		(1ULL << WIDX_MODE_TWEAK_DECREASE) |
+		(1ULL << WIDX_LIFT_HILL_SPEED_INCREASE) |
+		(1ULL << WIDX_LIFT_HILL_SPEED_DECREASE) |
+		(1ULL << WIDX_MINIMUM_LENGTH_INCREASE) |
+		(1ULL << WIDX_MINIMUM_LENGTH_DECREASE) |
+		(1ULL << WIDX_MAXIMUM_LENGTH_INCREASE) |
+		(1ULL << WIDX_MAXIMUM_LENGTH_DECREASE),
 	0,
 	0,
 	0,
 	0,
 	0,
-	(1ULL << WIDX_PRIMARY_PRICE_INCREASE) | (1ULL << WIDX_PRIMARY_PRICE_DECREASE) | (1ULL << WIDX_SECONDARY_PRICE_INCREASE) | (1ULL << WIDX_SECONDARY_PRICE_DECREASE),
+	(1ULL << WIDX_PRIMARY_PRICE_INCREASE) |
+		(1ULL << WIDX_PRIMARY_PRICE_DECREASE) |
+		(1ULL << WIDX_SECONDARY_PRICE_INCREASE) |
+		(1ULL << WIDX_SECONDARY_PRICE_DECREASE),
 	0
 };
 
@@ -3308,7 +3396,13 @@ static void window_ride_operating_invalidate(rct_window *w)
 	set_format_arg(2, uint32, ride->name_arguments);
 
 	// Widget setup
-	w->pressed_widgets &= ~0x44700000;
+	w->pressed_widgets &= ~(
+		(1ULL << WIDX_LOAD_CHECKBOX) |
+		(1ULL << WIDX_LEAVE_WHEN_ANOTHER_ARRIVES_CHECKBOX) |
+		(1ULL << WIDX_MINIMUM_LENGTH_CHECKBOX) |
+		(1ULL << WIDX_MAXIMUM_LENGTH_CHECKBOX) |
+		(1ULL << WIDX_SYNCHRONISE_WITH_ADJACENT_STATIONS_CHECKBOX)
+		);
 
 	// Lift hill speed
 	if ((rideEntry->enabledTrackPiecesA & (1UL << TRACK_LIFT_HILL)) && track_type_is_invented(ride->type, TRACK_LIFT_HILL)) {