diff --git a/addons/mass_mailing/static/src/js/website_mass_mailing.js b/addons/mass_mailing/static/src/js/website_mass_mailing.js
index 2b636aec056..1f22f9f427f 100644
--- a/addons/mass_mailing/static/src/js/website_mass_mailing.js
+++ b/addons/mass_mailing/static/src/js/website_mass_mailing.js
@@ -20,10 +20,8 @@
                 self.$target.find('a.js_subscribe_btn')
                     .attr("disabled", data.is_subscriber && data.email.length ? "disabled" : false);
                 self.$target.removeClass("hidden");
-                if (data.is_subscriber) {
-                    self.$target.find('.js_subscribe_btn').addClass('hidden');
-                    self.$target.find('.js_subscribed_btn').removeClass('hidden');
-                }
+                self.$target.find('.js_subscribe_btn').toggleClass('hidden', !!data.is_subscriber);
+                self.$target.find('.js_subscribed_btn').toggleClass('hidden', !data.is_subscriber);
             });
 
             // not if editable mode to allow designer to edit alert field
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 6b4afd037b9..5ef46ee1266 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -155,7 +155,7 @@
             website.snippet.stop_animation();
             this.on('rte:ready', this, function () {
                 self.snippets.$button.removeClass("hidden");
-                website.snippet.start_animation();
+                website.snippet.start_animation(true);
                 $("#wrapwrap *").off('mousedown mouseup click');
             });