diff --git a/src/layouts/estimate/estimate.spec.js b/src/layouts/estimate/estimate.spec.js
index 2b52d3f3e..a24bc22b7 100644
--- a/src/layouts/estimate/estimate.spec.js
+++ b/src/layouts/estimate/estimate.spec.js
@@ -49,19 +49,22 @@ describe("estimate.vue", () => {
     //Assert
     expect(arePagePrerequisitesValid).toBe(true);
   });
-  test("isRepair is set to false, arePagePrerequisitesValid should return true", async () => {
+  test("isRepair is set to true, arePagePrerequisitesValid should return true", async () => {
 
     //Arrange 
     const { wrapper } = setupMocks({});
 
     //Act 
-    store.commit( storeMutations.UPDATE_IS_REPAIR, false );
+    store.commit( storeMutations.UPDATE_IS_REPAIR, true );
 
     let arePagePrerequisitesValid = wrapper.vm.arePagePrerequisitesValid();
 
     //Assert
     expect(arePagePrerequisitesValid).toBe(true);
   });
+  test.todo("isRepair is false and there are no lineItems => should return false")
+  test.todo("isRepair is false and lineItems is null => should return false")
+  test.todo("isRepair is false are there are lineItems => should return true")
   test("isRepair is set to null, arePagePrerequisitesValid should return false", async () => {
 
     //Arrange 
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index 26649942a..aae192291 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -80,10 +80,7 @@ export default {
   },
   methods: {
     arePagePrerequisitesValid() {
-      if(store.getters.damage.isRepair != null){
-        return true;
-      }
-      return false; 
+      return store.getters.damage.isRepair || store.getters.damage.glassToReplace?.length > 0;
     },
     backButtonAction() {
       // route to move backwards