diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js
index 4cbc38e8014..0281b9e8379 100644
--- a/addons/website_gengo/static/src/js/website_gengo.js
+++ b/addons/website_gengo/static/src/js/website_gengo.js
@@ -6,14 +6,15 @@ var core = require('web.core');
 var Dialog = require('web.Dialog');
 var Widget = require('web.Widget');
 var WysiwygTranslate = require('web_editor.wysiwyg.multizone.translate');
+var TranslatorMenu = require('website.editor.menu.translate');
 
 var qweb = core.qweb;
 var _t = core._t;
 
-WysiwygTranslate.include({
-    xmlDependencies: (WysiwygTranslate.prototype.xmlDependencies || [])
+TranslatorMenu.include({
+    xmlDependencies: (TranslatorMenu.prototype.xmlDependencies || [])
         .concat(['/website_gengo/static/src/xml/website.gengo.xml']),
-    events: _.extend({}, WysiwygTranslate.prototype.events, {
+    events: _.extend({}, TranslatorMenu.prototype.events, {
         'click a[data-action=translation_gengo_post]': 'translation_gengo_post',
         'click a[data-action=translation_gengo_info]': 'translation_gengo_info',
     }),
@@ -32,7 +33,6 @@ WysiwygTranslate.include({
             this.$('button[data-action=save]')
                 .after(qweb.render('website.ButtonGengoTranslator'));
         }
-
         this.translation_gengo_display();
 
         return def;
@@ -85,7 +85,7 @@ WysiwygTranslate.include({
                         'lang': context.lang,
                     }).then(function () {
                         ajax.jsonRpc('/website/post_gengo_jobs', 'call', {});
-                        self._save();
+                        self.save();
                     }).guardedCatch(function () {
                         Dialog.alert(null, _t("Could not Post translation"));
                     });
diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml
index dc6819ac230..2dca1629d46 100644
--- a/addons/website_gengo/static/src/xml/website.gengo.xml
+++ b/addons/website_gengo/static/src/xml/website.gengo.xml
@@ -6,7 +6,7 @@
     <a role="button" class="btn btn-danger d-none gengo_inprogress disabled"  href="#"> <i class="fa fa-clock-o"></i> Translation in Progress</a>
     <a role="button" class="btn btn-link gengo_info" data-action="translation_gengo_info">Count Words</a>
 </t>
-<t t-extend="web_editor.TranslatorInfoDialog">
+<t t-extend="website.TranslatorInfoDialog">
     <t t-jquery=".oe_translate_examples" t-operation="replace">
         <ul class="oe_translate_examples">
             <li style="background:#ffffb6;">
diff --git a/addons/website_gengo/views/website_gengo_templates.xml b/addons/website_gengo/views/website_gengo_templates.xml
index c2c5411d97f..df6322077d2 100644
--- a/addons/website_gengo/views/website_gengo_templates.xml
+++ b/addons/website_gengo/views/website_gengo_templates.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="gengo_assets_editor" inherit_id="website.assets_editor" name="Editor Head">
+    <template id="gengo_assets_editor" inherit_id="website.assets_wysiwyg" name="Editor Head">
         <xpath expr='.' position="inside">
             <link rel="stylesheet" href="/website_gengo/static/src/css/website_gengo.css"/>
             <script type="text/javascript" src="/website_gengo/static/src/js/website_gengo.js" />