diff --git a/addons/website/static/src/js/website.translator.js b/addons/website/static/src/js/website.translator.js
index a2893e61248..93d42b9df6e 100644
--- a/addons/website/static/src/js/website.translator.js
+++ b/addons/website/static/src/js/website.translator.js
@@ -120,8 +120,13 @@
             if (trans.length) {
                 node.setAttribute('data-oe-translation-id', trans[0].id);
                 if(trans[0].state && (trans[0].state == 'inprogress' || trans[0].state == 'to_translate')){
+                    if(this.gengo_translate){
                         node.className += ' oe_translatable_inprogress';
+                        }
+                    else{
+                        node.className += ' oe_translatable_todo';
                     }
+                }
             } else {
                 node.className += ' oe_translatable_todo';
             }
diff --git a/addons/website_gengo/static/src/js/website_gengo.js b/addons/website_gengo/static/src/js/website_gengo.js
index badb51f9296..b17c4761e49 100644
--- a/addons/website_gengo/static/src/js/website_gengo.js
+++ b/addons/website_gengo/static/src/js/website_gengo.js
@@ -53,8 +53,8 @@
             dialog.on('service_level', this, function () {
                 var gengo_service_level = dialog.$el.find(".form-control").val();
                 dialog.$el.modal('hide');
-                self.$el.find('.gengo_post').addClass("hidden");
-                self.$el.find('.gengo_inprogress').removeClass("hidden");
+                self.$el.find('.gengo_post,.gengo_discard').addClass("hidden");
+                self.$el.find('.gengo_wait').removeClass("hidden");
                 var trans ={}
                 $('.oe_translatable_todo').each(function () {
                     var $node = $(this);
@@ -74,6 +74,8 @@
                     'lang': website.get_context()['lang'],
                 }).done(function(){
                     $('.oe_translatable_todo').addClass('oe_translatable_inprogress').removeClass('oe_translatable_todo');
+                    self.$el.find('.gengo_wait').addClass("hidden");
+                    self.$el.find('.gengo_inprogress,.gengo_discard').removeClass("hidden");
                 });
             });
             
diff --git a/addons/website_gengo/static/src/xml/website.gengo.xml b/addons/website_gengo/static/src/xml/website.gengo.xml
index 00733829d42..d2cd9360dae 100644
--- a/addons/website_gengo/static/src/xml/website.gengo.xml
+++ b/addons/website_gengo/static/src/xml/website.gengo.xml
@@ -2,8 +2,8 @@
 <templates id="template" xml:space="preserve">
 <t t-name="website.ButtonGengoTranslator">
     <a class="btn btn-danger gengo_translate" data-action="translation_gengo" href="#">Gengo Translation</a>
-    <a class="btn btn-danger hidden gengo_post" data-action="translation_gengo_post" href="#">Post to Gengo</a><a class="btn btn-danger hidden gengo_inprogress disabled"  href="#"> <i class="fa fa-clock-o"></i> Translation in Progress</a><a class="btn btn-danger gengo_info hidden" data-action="translation_gengo_info"><i class="fa fa-info-circle"></i></a>
-    <span class="gengo_discard hidden"> or <a href="#" data-action="reload">Discard</a></span>
+    <a class="btn btn-danger hidden gengo_post" data-action="translation_gengo_post" href="#">Post to Gengo</a><a class="btn btn-danger hidden gengo_wait disabled"  href="#"> <i class="fa fa-spinner fa-spin"></i> Wait</a><a class="btn btn-danger hidden gengo_inprogress disabled"  href="#"> <i class="fa fa-clock-o"></i> Translation in Progress</a><a class="btn btn-danger gengo_info hidden" data-action="translation_gengo_info"><i class="fa fa-info-circle"></i></a>
+    <span class="gengo_discard hidden"> or <a href="#" data-action="reload">Return</a></span>
 </t>
 <t t-name="website.GengoTranslatorDialog">
     <div class="modal fade oe_website_translator" tabindex="-1" role="dialog">