diff --git a/app/components/ship_order_component.html.haml b/app/components/ship_order_component.html.haml
index be05f354e1..16490e5c88 100644
--- a/app/components/ship_order_component.html.haml
+++ b/app/components/ship_order_component.html.haml
@@ -1,4 +1,4 @@
-= render ConfirmModalComponent.new(id: dom_id(@order, :ship), confirm_reflexes: "click->Admin::OrdersReflex#ship", controller: "orders", reflex: "Admin::Orders#ship") do
+= render ConfirmModalComponent.new(id: dom_id(@order, :ship), confirm_actions: "click->modal#close", confirm_reflexes: "click->Admin::OrdersReflex#ship", controller: "orders", reflex: "Admin::Orders#ship") do
   %div{class: "margin-bottom-30"}
     %p= t('spree.admin.orders.shipment.mark_as_shipped_message_html')
   %div{class: "margin-bottom-30"}
diff --git a/spec/system/admin/fees_on_orders_spec.rb b/spec/system/admin/fees_on_orders_spec.rb
index 7e66888800..94c4dcb57a 100644
--- a/spec/system/admin/fees_on_orders_spec.rb
+++ b/spec/system/admin/fees_on_orders_spec.rb
@@ -555,7 +555,7 @@ RSpec.describe '
                 find_button("Confirm").click
               end
 
-              expect(page).to have_selector('.reveal-modal', visible: false)
+              expect(page).not_to have_content("This will mark the order as Shipped.")
               expect(page).to have_content "SHIPPED"
               click_link('Order Details') unless subpage == 'Order Details'
 
@@ -578,7 +578,7 @@ RSpec.describe '
                 find_button("Confirm").click
               end
 
-              expect(page).to have_selector('.reveal-modal', visible: false)
+              expect(page).not_to have_content("This will mark the order as Shipped.")
               click_link('Order Details') unless subpage == 'Order Details'
 
               expect(page).to have_content "SHIPPED"