diff --git a/addons/website/static/src/js/website.tour.js b/addons/website/static/src/js/website.tour.js
index 017d937fc83..942c3d79f58 100644
--- a/addons/website/static/src/js/website.tour.js
+++ b/addons/website/static/src/js/website.tour.js
@@ -147,7 +147,7 @@
         },
         resume: function () {
             // Override if necessary
-            return !this.ended();
+            return this.tourStorage.getItem(this.id+'_current_step') && !this.ended();
         },
         trigger: function (url) {
             // Override if necessary
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index 9fc34fc0f17..665515c2265 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -140,7 +140,8 @@
                     stepId: 'congratulations',
                     title: "Congratulations",
                     content: "Congratulations! You just created and published your first product.",
-                    template: self.popover({ end: "Ok" }),
+                    template: self.popover({ end: "Close Tutorial" }),
+                    backdrop: true,
                 },
             ];
             return this._super();