diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue
index 9804331f4..f4aad38ea 100644
--- a/src/layouts/vehicle-damage/vehicle-damage.vue
+++ b/src/layouts/vehicle-damage/vehicle-damage.vue
@@ -359,9 +359,7 @@ export default {
         });
     },
     isWindshieldRepair() {
-      if (!this.isWindshieldDamageLocation) return false;
-
-      return this.selectedWindshieldOptions.selectedWindshieldDamageType === damageLocationsSelected.REPAIR;
+      return this.isWindshieldDamageLocation && this.selectedWindshieldOptions.selectedWindshieldDamageType === damageLocationsSelected.REPAIR;
     },
     isDriverSideReplace() {
       if (!this.isSideDoorDamageLocation) return false;
diff --git a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
index 296b3a95a..ce162617d 100644
--- a/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
+++ b/src/layouts/vehicle-damage/windshield-options/windshield-damage-type-question/windshield-damage-type-question.vue
@@ -42,7 +42,6 @@ export default ({
             },
             set: function(newValue) {
                 this.$emit("update:modelValue", newValue);
-                this.$nextTick();
             }
         },
     },