diff --git a/src/windows/ride.c b/src/windows/ride.c
index 3ac839dea9..db039493ec 100644
--- a/src/windows/ride.c
+++ b/src/windows/ride.c
@@ -2279,8 +2279,9 @@ static void window_ride_vehicle_mousedown(int widgetIndex, rct_window *w, rct_wi
 		for (currentRideEntryIndex = rideEntryIndexPtr; *currentRideEntryIndex != 0xFF; currentRideEntryIndex++) {
 			rideEntryIndex = *currentRideEntryIndex;
 			currentRideEntry = GET_RIDE_ENTRY(rideEntryIndex);
-			if (currentRideEntry->var_008 & 0x3000)
-				continue;
+			// Same track type, but not same subtype
+			/*if (currentRideEntry->var_008 & 0x3000)
+				continue;*/
 
 			quadIndex = rideEntryIndex >> 5;
 			bitIndex = rideEntryIndex & 0x1F;
@@ -2438,15 +2439,16 @@ static void window_ride_vehicle_invalidate()
 
 	// Vehicle type
 	window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].image = rideEntry->name;
-	if (var_496(w) <= 1 || (rideEntry->var_008 & (1 << 13))) {
+	// Always show a dropdown button
+	/*if (var_496(w) <= 1 || (rideEntry->var_008 & (1 << 13))) {
 		window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].type = WWT_14;
 		window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE_DROPDOWN].type = WWT_EMPTY;
 		w->enabled_widgets &= ~(1 << WIDX_VEHICLE_TYPE);
-	} else {
+	} else {*/
 		window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE].type = WWT_DROPDOWN;
 		window_ride_vehicle_widgets[WIDX_VEHICLE_TYPE_DROPDOWN].type = WWT_DROPDOWN_BUTTON;
 		w->enabled_widgets |= (1 << WIDX_VEHICLE_TYPE);
-	}
+	//}
 
 	// Trains
 	if (rideEntry->var_011 > 1) {
@@ -5883,4 +5885,4 @@ static void window_ride_customer_paint()
 	gfx_draw_string_left(dpi, stringId, &age, 0, x, y);
 }
 
-#pragma endregion
\ No newline at end of file
+#pragma endregion