diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 70e4fbe198..7f4e16d98f 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -538,9 +538,9 @@ void Vehicle::PreDestructor()
 		delete this->Next();
 	}
 
-	Window *w = FindWindowById(WC_VEHICLE_VIEW, this->index);
-	if (w != NULL && WP(w, vp_d).follow_vehicle == this->index) {
-		ScrollMainWindowTo(this->x_pos, this->y_pos); // lock the main view on the vehicle's last position
+	Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
+	if (WP(w, vp_d).follow_vehicle == this->index) {
+		ScrollMainWindowTo(this->x_pos, this->y_pos, true); // lock the main view on the vehicle's last position
 		WP(w, vp_d).follow_vehicle = INVALID_VEHICLE;
 	}
 }