diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 265ad56a..5fac4f61 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -216,6 +216,13 @@ export default {
                     === damageLocationsSelected.REPAIR
             );
         },
+        isWindshieldReplace() {
+            return (
+                this.isWindshieldDamageLocation
+                && this.selectedWindshieldOptions.selectedWindshieldDamageType
+                    === damageLocationsSelected.REPLACE
+            );
+        },
         isDriverSideReplace() {
             if (!this.isSideDoorDamageLocation) return false;
 
@@ -418,7 +425,7 @@ export default {
                     this.navigationScenarios.CLICKED_FORWARD_WITH_REPAIR,
                     this.$route
                 );
-            } else if (this.mainStore.order.vehicle.vin) {
+            } else if (this.mainStore.order.vehicle.vin || !this.isWindshieldReplace) {
                 // If vin already exists, navigate directly to vin-lookup
 
                 const partsOrQuestionsResponse = await this.getPartsOrQuestions();