diff --git a/app/helpers/spree/orders_helper.rb b/app/helpers/spree/orders_helper.rb
index 268d1876c1..06b20e70c0 100644
--- a/app/helpers/spree/orders_helper.rb
+++ b/app/helpers/spree/orders_helper.rb
@@ -30,7 +30,7 @@ module Spree
     end
 
     def changeable_orders_link_path
-      changeable_orders.one? ? order_path(changeable_orders.first) : spree.account_path
+      changeable_orders.one? ? main_app.order_path(changeable_orders.first) : spree.account_path
     end
 
     def shop_changeable_orders_alert_html
diff --git a/spec/features/consumer/shopping/cart_spec.rb b/spec/features/consumer/shopping/cart_spec.rb
index 0a7ffdb8a1..d041f5fdc7 100644
--- a/spec/features/consumer/shopping/cart_spec.rb
+++ b/spec/features/consumer/shopping/cart_spec.rb
@@ -315,6 +315,16 @@ feature "full-page cart", js: true do
         expect(page).to have_no_content item1.variant.name
         expect(page).to have_content item2.variant.name
       end
+
+      context "with a single editable order" do # Regression test for #8191
+        before do
+          prev_order2.destroy
+        end
+
+        it "doesn't throw an error" do
+          expect{ visit main_app.cart_path }.to_not raise_error
+        end
+      end
     end
   end
 end