diff --git a/src/management/marketing.c b/src/management/marketing.c
index dcf575e74b..d60a351c73 100644
--- a/src/management/marketing.c
+++ b/src/management/marketing.c
@@ -92,8 +92,9 @@ void marketing_update()
 
 		// This sets the string parameters for the marketing types that have an argument.
 		if (campaign == ADVERTISING_CAMPAIGN_RIDE_FREE || campaign == ADVERTISING_CAMPAIGN_RIDE) {
-			RCT2_GLOBAL(0x013CE952, uint16) = RCT2_GLOBAL(0x01362942 + 304 * campaignItem, uint16);
-			RCT2_GLOBAL(0x013CE954, uint32) = RCT2_GLOBAL(0x01362944 + 152 * campaignItem, uint32);
+			rct_ride* ride = GET_RIDE(campaignItem);
+			RCT2_GLOBAL(0x013CE952, uint16) = ride->name;
+			RCT2_GLOBAL(0x013CE954, uint32) = ride->name_arguments;
 		} else if (campaign == ADVERTISING_CAMPAIGN_FOOD_OR_DRINK_FREE) {
 			campaignItem += 2016;
 			if (campaignItem >= 2048)
diff --git a/src/windows/new_ride.c b/src/windows/new_ride.c
index 9324c8ff80..a4a3ab51b6 100644
--- a/src/windows/new_ride.c
+++ b/src/windows/new_ride.c
@@ -446,7 +446,7 @@ void window_new_ride_focus(ride_list_item rideItem)
 
 	ride_list_item *listItem = (ride_list_item*)0x00F43523;
 	while (listItem->type != RIDE_TYPE_NULL) {
-		if (listItem->type == rideItem.type && listItem->entry_index == rideItem.type) {
+		if (listItem->type == rideItem.type && listItem->entry_index == rideItem.entry_index) {
 			RCT2_GLOBAL(0x00F43825, uint8) = rideItem.type;
 			RCT2_GLOBAL(0x00F43826, uint8) = rideItem.entry_index;
 			w->new_ride.highlighted_ride_id = (rideItem.entry_index << 8) | rideItem.type;