diff --git a/src/components/VehiclesManager/VehicleEditModal.vue b/src/components/VehiclesManager/VehicleEditModal.vue
index 1796b0b..2903d70 100644
--- a/src/components/VehiclesManager/VehicleEditModal.vue
+++ b/src/components/VehiclesManager/VehicleEditModal.vue
@@ -135,22 +135,26 @@ onMounted(() => {
     vehiclesStore.vehiclesTable.find((v) => v.vehicleRef.id == vehiclesStore.selectedVehicleId)?.vehicleRef ?? null;
 
   if (currentVehicleRef.value) {
-    const lastProps = vehiclesStore.lastVehicleUpdateProps;
-    
-    vehicleValues.name = currentVehicleRef.value.name || '';
-    vehicleValues.cabinName = lastProps.cabinName || currentVehicleRef.value.cabinName;
-    vehicleValues.type = lastProps.type || currentVehicleRef.value.type || '';
-    vehicleValues.vehicleGroupsId = lastProps.vehicleGroupsId || currentVehicleRef.value.vehicleGroupsId || 0;
-    vehicleValues.hidden = lastProps.hidden || currentVehicleRef.value.hidden;
-    vehicleValues.restrictions = {
-      sponsorOnly: lastProps.restrictions?.sponsorOnly ?? currentVehicleRef.value.restrictions?.sponsorOnly ?? null,
-      teamOnly: lastProps.restrictions?.teamOnly ?? currentVehicleRef.value.restrictions?.teamOnly ?? false,
-    };
+    populateVehicleValues(currentVehicleRef.value);
   }
 
   modalElementRef.value?.focus();
 });
 
+function populateVehicleValues(vehicle: IVehicle) {
+  const lastProps = vehiclesStore.lastVehicleUpdateProps;
+
+  vehicleValues.name = vehicle.name || '';
+  vehicleValues.cabinName = lastProps.cabinName || vehicle.cabinName;
+  vehicleValues.type = lastProps.type || vehicle.type || '';
+  vehicleValues.vehicleGroupsId = lastProps.vehicleGroupsId || vehicle.vehicleGroupsId || 0;
+  vehicleValues.hidden = lastProps.hidden || vehicle.hidden;
+  vehicleValues.restrictions = {
+    sponsorOnly: lastProps.restrictions?.sponsorOnly ?? vehicle.restrictions?.sponsorOnly ?? null,
+    teamOnly: lastProps.restrictions?.teamOnly ?? vehicle.restrictions?.teamOnly ?? false,
+  };
+}
+
 function closeModal() {
   vehiclesStore.selectedVehicleId = -1;
 }