diff --git a/app/controllers/spree/checkout_controller.rb b/app/controllers/spree/checkout_controller.rb
new file mode 100644
index 0000000000..97fe2c20f9
--- /dev/null
+++ b/app/controllers/spree/checkout_controller.rb
@@ -0,0 +1,8 @@
+module Spree
+  class CheckoutController < Spree::StoreController
+    def edit
+      flash.keep
+      redirect_to main_app.checkout_path
+    end
+  end
+end