diff --git a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
index 5fbc95827..4827a9a5a 100644
--- a/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
+++ b/src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
@@ -50,6 +50,10 @@ export default {
     mounted() {
         if (this.showSaveProgressPopup) this.modal.openModal();
     },
+    unmounted() {
+        // remove any modal effects before leaving page (e.g. user hits browser back button)
+        this.modal.closeModal();
+    },
     emits: ["close-save-progress-popup", "save-progress"], // <--- should remove oodles of warnings in dev tools
     props: {
         modelValue: Object,
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 366a9d2cc..f2176a529 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -442,6 +442,9 @@ export default {
             showSaveProgressPopup: null,
         };
     },
+    mounted() {
+        this.attachCustomEvents();
+    },
     computed: {
         lineItemsCloneForWatcher() {
             return Object.assign({}, this.lineItems);
@@ -677,9 +680,6 @@ export default {
             });
         },
     },
-    mounted() {
-        this.attachCustomEvents();
-    },
     watch: {
         lineItemsCloneForWatcher: {
             handler(newValue, oldValue) {