diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb
index a1e1f84ec2..2c9bb17990 100644
--- a/app/helpers/shared_helper.rb
+++ b/app/helpers/shared_helper.rb
@@ -16,4 +16,8 @@ module SharedHelper
   def admin_user?
     spree_current_user.andand.has_spree_role? 'admin'
   end
+
+  def current_shop_products_path
+    "#{main_app.enterprise_shop_path(current_distributor)}#/shop"
+  end
 end
diff --git a/app/views/spree/orders/form/_cart_links.html.haml b/app/views/spree/orders/form/_cart_links.html.haml
index cec97a8a4d..d787b9c50f 100644
--- a/app/views/spree/orders/form/_cart_links.html.haml
+++ b/app/views/spree/orders/form/_cart_links.html.haml
@@ -1,6 +1,6 @@
 .row.links{'data-hook' => "cart_buttons"}
   .columns.large-8{"data-hook" => ""}
-    %a.button.large.secondary{href: main_app.shop_path}
+    %a.button.large.secondary{href: current_shop_products_path}
       %i.ofn-i_008-caret-left
       = t :orders_edit_continue
   .columns.large-4.text-right
diff --git a/spec/features/consumer/shopping/cart_spec.rb b/spec/features/consumer/shopping/cart_spec.rb
index 424ba45faa..ace11e775a 100644
--- a/spec/features/consumer/shopping/cart_spec.rb
+++ b/spec/features/consumer/shopping/cart_spec.rb
@@ -24,8 +24,7 @@ feature "full-page cart", js: true do
       it "shows a button leading back to the shop" do
         # Set up a shopfront message to test that we are not going to the
         # home tab.
-        # PENDING: this passes only without home tab!
-        #distributor.preferred_shopfront_message = "Test driven farming"
+        distributor.preferred_shopfront_message = "Test driven farming"
 
         add_product_to_cart order, product_with_fee, quantity: 2
         visit main_app.cart_path
@@ -36,7 +35,7 @@ feature "full-page cart", js: true do
 
         expect(page).to have_no_link "Continue shopping"
         expect(page).to have_button "Edit your cart"
-        #expect(page).to have_no_content distributor.preferred_shopfront_message
+        expect(page).to have_no_content distributor.preferred_shopfront_message
       end
     end