diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 72ec7ed3083..1015402d4d2 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -7,6 +7,7 @@
 - [*] Improve card payments onboarding error handling to show network errors correctly [https://github.com/woocommerce/woocommerce-ios/pull/16304]
 - [*] Authenticate the admin page automatically for sites with SSO enabled in custom fields, in-person payment setup, and editing tax rates flows. [https://github.com/woocommerce/woocommerce-ios/pull/16318]
 - [*] Show POS feedback surveys for eligible merchants [https://github.com/woocommerce/woocommerce-ios/pull/16325]
+- [*] Fix product variation selection for order creation [https://github.com/woocommerce/woocommerce-ios/pull/16317]
 
 23.6
 -----
diff --git a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift
index 4e0c9e79d32..9c9887f3174 100644
--- a/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift	
+++ b/WooCommerce/Classes/ViewRelated/Orders/Order Creation/OrderForm.swift	
@@ -139,7 +139,7 @@ struct OrderFormPresentationWrapper: View {
             },
             secondaryView: { isShowingProductSelector in
                 if let productSelectorViewModel = viewModel.productSelectorViewModel {
-                    ProductSelectorView(configuration: .loadConfiguration(for: horizontalSizeClass),
+                    ProductSelectorNavigationView(configuration: .loadConfiguration(for: horizontalSizeClass),
                                         isPresented: isShowingProductSelector,
                                         viewModel: productSelectorViewModel)
                     .sheet(item: $viewModel.productToConfigureViewModel) { viewModel in
diff --git a/WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorNavigationView.swift b/WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorNavigationView.swift
index b114ac00e1b..12fed714f96 100644
--- a/WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorNavigationView.swift
+++ b/WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorNavigationView.swift
@@ -15,12 +15,11 @@ struct ProductSelectorNavigationView: View {
     }
 
     var body: some View {
-        NavigationView {
+        NavigationStack {
             ProductSelectorView(configuration: configuration,
                                 isPresented: $isPresented,
                                 viewModel: viewModel)
         }
-        .navigationViewStyle(.stack)
         .wooNavigationBarStyle()
     }
 }