diff --git a/app/webpacker/controllers/guest_checkout_controller.js b/app/webpacker/controllers/guest_checkout_controller.js
index 189505f207..c366f02553 100644
--- a/app/webpacker/controllers/guest_checkout_controller.js
+++ b/app/webpacker/controllers/guest_checkout_controller.js
@@ -21,6 +21,10 @@ export default class extends Controller {
     }
   }
 
+  disconnect() {
+    this.removeUnloadEvent();
+  }
+
   login() {
     window.dispatchEvent(new Event("login:modal:open"));
   }
@@ -40,10 +44,8 @@ export default class extends Controller {
   }
 
   handlePageUnload(event) {
-    event.preventDefault()
-
-    event.returnValue = 'I18n.t("admin.unsaved_confirm_leave")';
-    return 
+    event.preventDefault();
+    event.returnValue = I18n.t("admin.unsaved_confirm_leave");
   }
 
   removeUnloadEvent() {
@@ -51,8 +53,4 @@ export default class extends Controller {
       window.removeEventListener('beforeunload', this.handlePageUnload);
     }
   }
-
-  disconnect() {
-    this.removeUnloadEvent();
-  }
 }