diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 19e65ffa0dd..c1a533d009e 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -3,6 +3,7 @@
 
 22.1
 -----
+- [*] Order Creation: Resolved an issue where the exit confirmation was not displayed when there were unsaved changes in a split view [https://github.com/woocommerce/woocommerce-ios/pull/15394].
 - [*] Order Creation: Fixed an issue where order recalculation would stop working after canceling a confirmation with unsaved changes [https://github.com/woocommerce/woocommerce-ios/pull/15392].
 - [internal] Improve data fetching in Order Details, to avoid I/O performance on the main thread. [https://github.com/woocommerce/woocommerce-ios/pull/14999]
 
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift
index e2fd848da23..b8a3aa90810 100644
--- a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift	
+++ b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/EditableOrderViewModel.swift	
@@ -77,8 +77,10 @@ final class EditableOrderViewModel: ObservableObject {
         switch flow {
         case .creation: // Creation can be dismissed when there aren't changes pending to commit.
             return !hasChanges
-        case .editing: // Editing can always be dismissed because changes are committed instantly.
-            return true
+        case .editing:
+            // In a single-view layout: Editing can always be dismissed because changes are committed instantly.
+            // In a split-view layout: Editing can be dismissed when there aren't product changes pending to recalculate.
+            return !(selectionSyncApproach == .onRecalculateButtonTap && syncRequired)
         }
     }
 
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift
index 747af4d94e8..0f786ae2fa4 100644
--- a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift	
+++ b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift	
@@ -90,7 +90,9 @@ private extension OrderFormHostingController {
     }
 
     func discardOrderAndDismiss() {
-        viewModel.discardOrder()
+        if viewModel.flow == .creation {
+            viewModel.discardOrder()
+        }
         dismiss(animated: true)
     }
 
diff --git a/WooCommerce/WooCommerce.xcodeproj/xcshareddata/xcschemes/WooCommerce.xcscheme b/WooCommerce/WooCommerce.xcodeproj/xcshareddata/xcschemes/WooCommerce.xcscheme
index 6701467249d..940a73b2942 100644
--- a/WooCommerce/WooCommerce.xcodeproj/xcshareddata/xcschemes/WooCommerce.xcscheme
+++ b/WooCommerce/WooCommerce.xcodeproj/xcshareddata/xcschemes/WooCommerce.xcscheme
@@ -148,7 +148,7 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-simulate-stripe-card-reader"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "-force-crash-logging 1"
diff --git a/WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/EditableOrderViewModelTests.swift b/WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/EditableOrderViewModelTests.swift
index 91db76702fe..04b469379f1 100644
--- a/WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/EditableOrderViewModelTests.swift	
+++ b/WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/EditableOrderViewModelTests.swift	
@@ -3312,6 +3312,45 @@ final class EditableOrderViewModelTests: XCTestCase {
         assertEqual(customerData.billing, orderToUpdate.billingAddress)
         assertEqual(customerData.shipping, orderToUpdate.shippingAddress)
     }
+
+    func test_canBeDismissed_whenEditing_withNoChanges_returnsTrue() {
+        // Given
+        let initialOrder = Order.fake()
+        let viewModel = EditableOrderViewModel(siteID: 123, flow: .editing(initialOrder: initialOrder))
+
+        // When
+        viewModel.selectionSyncApproach = .onRecalculateButtonTap
+        viewModel.syncRequired = false
+
+        // Then
+        XCTAssertTrue(viewModel.canBeDismissed)
+    }
+
+    func test_canBeDismissed_whenEditing_withPendingRecalculation_returnsFalse() {
+        // Given
+        let initialOrder = Order.fake()
+        let viewModel = EditableOrderViewModel(siteID: 123, flow: .editing(initialOrder: initialOrder))
+
+        // When
+        viewModel.selectionSyncApproach = .onRecalculateButtonTap
+        viewModel.syncRequired = true
+
+        // Then
+        XCTAssertFalse(viewModel.canBeDismissed)
+    }
+
+    func test_canBeDismissed_whenEditing_withImmediateSync_returnsTrue() {
+        // Given
+        let initialOrder = Order.fake()
+        let viewModel = EditableOrderViewModel(siteID: 123, flow: .editing(initialOrder: initialOrder))
+
+        // When
+        viewModel.selectionSyncApproach = .immediate
+        viewModel.syncRequired = true
+
+        // Then
+        XCTAssertTrue(viewModel.canBeDismissed)
+    }
 }
 
 private extension EditableOrderViewModelTests {