diff --git a/addons/web_editor/static/src/js/editor/snippets.options.js b/addons/web_editor/static/src/js/editor/snippets.options.js
index bbc55ccb0aa..79719a04287 100644
--- a/addons/web_editor/static/src/js/editor/snippets.options.js
+++ b/addons/web_editor/static/src/js/editor/snippets.options.js
@@ -2714,11 +2714,7 @@ const SnippetOptionWidget = Widget.extend({
             value = value.split(params.saveUnit).join('');
         }
         if (params.extraClass) {
-            if (params.defaultValue === value) {
-                await this.editorHelpers.removeClass(context, this.$target[0], params.extraClass, context);
-            } else {
-                await this.editorHelpers.addClass(context, this.$target[0], params.extraClass, context);
-            }
+            await this.editorHelpers.setClass(context, this.$target[0], params.extraClass, params.defaultValue !== value)
         }
         return value;
     },
@@ -4166,11 +4162,7 @@ registry.BackgroundPosition = SnippetOptionWidget.extend({
      */
     backgroundType: async function (previewMode, widgetValue, params) {
         const backgroundType = async (context)=> {
-            if (widgetValue === 'repeat-pattern') {
-                await this.editorHelpers.addClass(context, this.$target[0], 'o_bg_img_opt_repeat');
-            } else {
-                await this.editorHelpers.removeClass(context, this.$target[0], 'o_bg_img_opt_repeat');
-            }
+            await this.editorHelpers.setClass(context, this.$target[0], 'o_bg_img_opt_repeat', widgetValue === 'repeat-pattern');
             await this.editorHelpers.setStyle(context, this.$target[0], 'background-position', '');
             await this.editorHelpers.setStyle(context, this.$target[0], 'background-size', '');
         }
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js
index ca4f91c5bcc..6b163b6b34f 100644
--- a/addons/website/static/src/js/menu/content.js
+++ b/addons/website/static/src/js/menu/content.js
@@ -794,11 +794,7 @@ var ContentMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
         header_overlay: async function (value, wysiwyg) {
             const $wrapwrap = $('#wrapwrap');
             wysiwyg = wysiwyg || $wrapwrap.data('wysiwyg');
-            if (value) {
-                await wysiwyg.editorHelpers.addClass(wysiwyg.editor, $wrapwrap[0], 'o_header_overlay');
-            } else {
-                await wysiwyg.editorHelpers.removeClass(wysiwyg.editor, $wrapwrap[0], 'o_header_overlay');
-            }
+            await wysiwyg.editorHelpers.setClass(wysiwyg.editor, $wrapwrap[0], 'o_header_overlay', !!value);
         },
         header_color: async function (value, wysiwyg) {
             const $wrapwrap = $('#wrapwrap');
diff --git a/addons/website/static/src/snippets/s_countdown/options.js b/addons/website/static/src/snippets/s_countdown/options.js
index 33d89c2bdb5..1cfab973a79 100644
--- a/addons/website/static/src/snippets/s_countdown/options.js
+++ b/addons/website/static/src/snippets/s_countdown/options.js
@@ -27,11 +27,7 @@ snippetOptions.registry.countdown = snippetOptions.SnippetOptionWidget.extend({
                 if (!this.$target.find('.s_countdown_end_message').length) {
                     const message = this.endMessage || qweb.render('website.s_countdown.end_message');
                     await this.editorHelpers.insertHtml(context, message, this.$target.find('.container')[0], 'INSIDE');
-                    if (widgetValue === 'message_no_countdown') {
-                        await this.editorHelpers.addClass(this.wysiwyg.editor, this.$target, 'flex-row-reverse flex-row');
-                    } else {
-                        await this.editorHelpers.removeClass(this.wysiwyg.editor, this.$target, 'flex-row-reverse flex-row');
-                    }
+                    await this.editorHelpers.setClass(this.wysiwyg.editor, this.$target, 'flex-row-reverse flex-row', widgetValue === 'message_no_countdown');
                 }
             } else {
                 const $message = this.$target.find('.s_countdown_end_message');