diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index 11efc67d7ae..4fb27b6c75f 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -83,7 +83,8 @@
             var $editables = $('[data-oe-model="ir.ui.view"]')
                     .not('link, script')
                     .not('.oe_snippets,.oe_snippet, .oe_snippet *, .navbar-toggle')
-                    .not('[data-oe-type]');
+                    .not('[data-oe-type]')
+                    .add($('[data-oe-translate="1"]:not([data-oe-model="ir.ui.view"])').addClass('o_editable'));
 
             $editables.each(function () {
                 var $node = $(this);
@@ -106,7 +107,7 @@
                         self.sanitizeNode($node[0]);
                     }
                     if (self.getInitialContent($node[0]) !== $node.text()) {
-                        $node.addClass('oe_dirty').removeClass('oe_translatable_todo oe_translatable_inprogress');
+                        $node.addClass('o_dirty').removeClass('oe_translatable_todo oe_translatable_inprogress');
                     }
                 }, 0);
             });
@@ -127,7 +128,7 @@
             // TODO: link nodes with same content
             node.className += ' oe_translatable_text';
             node.setAttribute('data-oe-translation-view-id', view_id);
-            var content = node.childNodes[0].data.trim();
+            var content = $(node).text().trim();
             var trans = this.translations.filter(function (t) {
                 return t.res_id === view_id && t.value.trim() === content;
             });
@@ -146,10 +147,9 @@
         },
         save: function () {
             var self = this;
-            var mysuper = this._super;
             var trans = {};
             // this._super.apply(this, arguments);
-            $('.oe_translatable_text.oe_dirty').each(function () {
+            $('.oe_translatable_text.o_dirty').each(function () {
                 var $node = $(this);
                 var data = $node.data();
                 if (!trans[data.oeTranslationViewId]) {
@@ -165,8 +165,7 @@
                 'data': trans,
                 'lang': website.get_context()['lang'],
             }).then(function () {
-                window.onbeforeunload = null;
-                website.reload();
+                self._save();
             }).fail(function () {
                 // TODO: bootstrap alert with error message
                 alert("Could not save translation");
@@ -179,6 +178,7 @@
                 if (node.attributes['data-oe-translate'].value == '1') {
                     node.className += ' oe_translatable_field';
                 }
+                this.markTranslatableNode(node, view_id);
             } else if (node.childNodes.length === 1
                     && this.isTextNode(node.childNodes[0])
                     && !node.getAttribute('data-oe-model')) {