diff --git a/app/assets/javascripts/admin/utils/services/navigation_check.js.coffee b/app/assets/javascripts/admin/utils/services/navigation_check.js.coffee
index 89ebd5b90e..5d90b023dc 100644
--- a/app/assets/javascripts/admin/utils/services/navigation_check.js.coffee
+++ b/app/assets/javascripts/admin/utils/services/navigation_check.js.coffee
@@ -9,6 +9,7 @@ angular.module("admin.utils")
           $window.onbeforeunload = @onBeforeUnloadHandler
 
         $rootScope.$on "$locationChangeStart", @locationChangeStartHandler
+        $window.onBeforeUnloadHandler = @onBeforeUnloadHandler
 
       # Action for regular browser navigation.
       onBeforeUnloadHandler: ($event) =>
diff --git a/app/views/admin/order_cycles/_date_time_warning_modal_content.html.haml b/app/views/admin/order_cycles/_date_time_warning_modal_content.html.haml
index 525c1407b7..8742d80fad 100644
--- a/app/views/admin/order_cycles/_date_time_warning_modal_content.html.haml
+++ b/app/views/admin/order_cycles/_date_time_warning_modal_content.html.haml
@@ -11,8 +11,7 @@
       = t('.proceed')
     %button.button.secondary{ "ng-click": "submit($event, '#{main_app.admin_order_cycles_path}')", type: "button", style: "display: none;", data: { action: 'click->modal#close', 'trigger-action': 'saveAndBack' } }
       = t('.proceed')
-    = link_to t('.cancel'), admin_order_cycles_path, id: 'cancel', class: 'button primary'
-
+    = link_to t('.cancel'), admin_order_cycles_path, id: 'cancel', class: 'button primary', data: { 'order-cycle-form-target': 'cancel' }
   - if action == 'bulk_update'
     %button.button.secondary{ "ng-click": "saveAll($event)", type: "button", style: "display: none;", data: { action: 'click->modal#close', trigger_action: 'bulk_save' } }
       = t('.proceed')
diff --git a/app/webpacker/controllers/order_cycle_form_controller.js b/app/webpacker/controllers/order_cycle_form_controller.js
index f4c8809360..a92d621dec 100644
--- a/app/webpacker/controllers/order_cycle_form_controller.js
+++ b/app/webpacker/controllers/order_cycle_form_controller.js
@@ -1,13 +1,17 @@
 import { Controller } from "stimulus";
 
 export default class extends Controller {
-  static targets = ['statusMessage']
+  static targets = ['statusMessage', 'cancel']
   connect() {
     this.observer = new MutationObserver(this.updateCallback);
     this.observer.observe(
       this.statusMessageTarget,
       { attributes: true, attributeOldValue: true, attributeFilter: ['data-type'] }
     );
+
+    if (this.hasCancelTarget) {
+      this.cancelTarget.addEventListener('click', this.removeUnloadEvent)
+    }
   }
 
   // Callback to trigger warning modal
@@ -38,7 +42,14 @@ export default class extends Controller {
     }
   }
 
+  removeUnloadEvent() {
+    window.removeEventListener('beforeunload', window.onBeforeUnloadHandler)
+  }
+
   disconnect() {
     this.observer.disconnect();
+    if (this.hasCancelTarget) {
+      this.cancelTarget.removeEventListener('click', this.removeUnloadEvent)
+    }
   }
 }