diff --git a/app/views/checkout/edit.html.haml b/app/views/checkout/edit.html.haml
index 312b7b5a79..27271ae6d3 100644
--- a/app/views/checkout/edit.html.haml
+++ b/app/views/checkout/edit.html.haml
@@ -15,7 +15,7 @@
       %strong
         = pickup_time current_order_cycle
 
-  = render partial: "shopping_shared/header"
+  = render partial: "shopping_shared/header", locals: { hide_oc_selector: true }
 
   %accordion{"close-others" => "false"}
     %checkout.row{"ng-controller" => "CheckoutCtrl"}
diff --git a/app/views/shopping_shared/_header.html.haml b/app/views/shopping_shared/_header.html.haml
index 03661a22ea..37806539e2 100644
--- a/app/views/shopping_shared/_header.html.haml
+++ b/app/views/shopping_shared/_header.html.haml
@@ -10,5 +10,6 @@
           = distributor.name
         %location= distributor.address.city
 
-    .show-for-large-up.large-4.columns
-      = render partial: "shopping_shared/order_cycles"
+    - unless defined? hide_oc_selector
+      .show-for-large-up.large-4.columns
+        = render partial: "shopping_shared/order_cycles"
diff --git a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
index 4a70dbf672..290c6af516 100644
--- a/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
+++ b/spec/features/consumer/shopping/embedded_shopfronts_spec.rb
@@ -53,7 +53,7 @@ feature "Using embedded shopfront functionality", js: true do
         expect(page).to have_text 'Your shopping cart'
         find('a#checkout-link').click
 
-        expect(page).to have_text 'Checkout now'
+        expect(page).to have_text 'Ok, ready to checkout?'
 
         click_button 'Login'
         login_with_modal