diff --git a/addons/website/static/src/js/website.editor.newpage.js b/addons/website/static/src/js/website.editor.newpage.js
index 944a24b89d8..8d3b3e9b6b5 100644
--- a/addons/website/static/src/js/website.editor.newpage.js
+++ b/addons/website/static/src/js/website.editor.newpage.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.is_editable = true;
     website.is_editable_button = true;
     
@@ -16,7 +17,8 @@
             'click a[data-action=new_page]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Page",
+                    id: "editor_new_page",
+                    window_title: _t("New Page"),
                     input: "Page Title",
                 }).then(function (val) {
                     if (val) {
diff --git a/addons/website/static/src/xml/website.xml b/addons/website/static/src/xml/website.xml
index 5890350e2dc..f25a491a106 100644
--- a/addons/website/static/src/xml/website.xml
+++ b/addons/website/static/src/xml/website.xml
@@ -102,7 +102,7 @@
                         <h3 class="modal-title"><t t-esc="window_title"/></h3>
                     </div>
                     <div class="modal-body">
-                        <form class="form-horizontal" role="form">
+                        <form class="form-horizontal" role="form" t-att-id="id">
                         <div class="form-group mb0">
                             <label for="page-name" class="col-sm-3 control-label">
                                 <t t-esc="field_name"/>:
diff --git a/addons/website_blog/static/src/js/website.tour.blog.js b/addons/website_blog/static/src/js/website.tour.blog.js
index ffbd6e7ecc8..c943d46e0bb 100644
--- a/addons/website_blog/static/src/js/website.tour.blog.js
+++ b/addons/website_blog/static/src/js/website.tour.blog.js
@@ -37,13 +37,14 @@
                     template:  self.popover({ fixed: true }),
                 },
                 {
-                    element:   '.modal button.btn-primary',
-                    placement: 'bottom',
+                    element:   '.modal:has(#editor_new_blog) button.btn-primary',
+                    placement: 'right',
                     title:     "Create Blog Post",
                     content:   "Click <em>Continue</em> to create the blog post.",
                 },
                 {
                     waitNot:   '.modal',
+                    waitFor:   'body:has(button[data-action=save]:visible):has(.js_blog)',
                     title:     "Blog Post Created",
                     content:   "This is your new blog post. Let's edit it.",
                     template:  self.popover({ next: "Continue" }),
diff --git a/addons/website_blog/static/src/js/website_blog.editor.js b/addons/website_blog/static/src/js/website_blog.editor.js
index 1626015ea1c..1c5deef56f7 100644
--- a/addons/website_blog/static/src/js/website_blog.editor.js
+++ b/addons/website_blog/static/src/js/website_blog.editor.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.add_template_file('/website_blog/static/src/xml/website_blog.xml');
 
     website.is_editable = true;
@@ -16,7 +17,8 @@
             'click a[data-action=new_blog_post]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Blog Post",
+                    id: "editor_new_blog",
+                    window_title: _t("New Blog Post"),
                     select: "Select Blog",
                     init: function (field) {
                         return website.session.model('blog.blog')
diff --git a/addons/website_event/static/src/js/website.tour.event.js b/addons/website_event/static/src/js/website.tour.event.js
index 05de73ceffb..c84c0b36bb6 100644
--- a/addons/website_event/static/src/js/website.tour.event.js
+++ b/addons/website_event/static/src/js/website.tour.event.js
@@ -37,7 +37,7 @@
                     template:  self.popover({ fixed: true }),
                 },
                 {
-                    element:   '.modal:contains("New Event") input[type=text]',
+                    element:   '.modal #editor_new_event input[type=text]',
                     sampleText: 'Advanced Technical Training',
                     placement: 'right',
                     title:     "Create an Event Name",
@@ -51,7 +51,7 @@
                     content:   "Click <em>Continue</em> to create the event.",
                 },
                 {
-                    waitFor:   '#website-top-navbar button[data-action="save"]:visible',
+                    waitFor:   'body:has(button[data-action=save]:visible):has(.js_event)',
                     title:     "New Event Created",
                     content:   "This is your new event page. We will edit the event presentation page.",
                     template:  self.popover({ next: "Continue" }),
diff --git a/addons/website_event/static/src/js/website_event.editor.js b/addons/website_event/static/src/js/website_event.editor.js
index 056d6ed37e4..ac81be7ec36 100644
--- a/addons/website_event/static/src/js/website_event.editor.js
+++ b/addons/website_event/static/src/js/website_event.editor.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.add_template_file('/website_event/static/src/xml/website_event.xml');
 
     website.is_editable = true;
@@ -16,7 +17,8 @@
             'click a[data-action=new_event]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Event",
+                    id: "editor_new_event",
+                    window_title: _t("New Event"),
                     input: "Event Name",
                 }).then(function (event_name) {
                     website.form('/event/add_event', 'POST', {
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 a141e991661..ae67d9b8c46 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -38,7 +38,7 @@
                     template:  self.popover({ fixed: true }),
                 },
                 {
-                    element:   '.modal:contains("New Product") input[type=text]',
+                    element:   '.modal #editor_new_product input[type=text]',
                     sampleText: 'New Product',
                     placement: 'right',
                     title:     "Choose name",
@@ -52,7 +52,7 @@
                     content:   "Click <em>Continue</em> to create the product.",
                 },
                 {
-                    waitFor:   '#website-top-navbar button[data-action="save"]:visible',
+                    waitFor:   'body:has(button[data-action=save]:visible):has(.js_sale)',
                     title:     "New product created",
                     content:   "This page contains all the information related to the new product.",
                     template:  self.popover({ next: "Continue" }),
diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js
index 1f41752dc7e..bb21c300fca 100644
--- a/addons/website_sale/static/src/js/website_sale.editor.js
+++ b/addons/website_sale/static/src/js/website_sale.editor.js
@@ -2,6 +2,7 @@
     "use strict";
 
     var website = openerp.website;
+    var _t = openerp._t;
     website.add_template_file('/website_sale/static/src/xml/website_sale.xml');
 
     website.is_editable = true;
@@ -16,7 +17,8 @@
             'click a[data-action=new_product]': function (ev) {
                 ev.preventDefault();
                 website.prompt({
-                    window_title: "New Product",
+                    id: "editor_new_product",
+                    window_title: _t("New Product"),
                     input: "Product Name",
                 }).then(function (name) {
                     website.form('/shop/add_product', 'POST', {