diff --git a/addons/website/static/src/snippets/s_popup/options.js b/addons/website/static/src/snippets/s_popup/options.js
index eff496375b8..e73ab7d3e82 100644
--- a/addons/website/static/src/snippets/s_popup/options.js
+++ b/addons/website/static/src/snippets/s_popup/options.js
@@ -49,6 +49,13 @@ options.registry.SnippetPopup = options.Class.extend({
      */
     onBuilt: function () {
         this._assignUniqueID();
+        // Fix in stable to convert the data-focus bootstrap option from version 4.0 to
+        // 5.1 (renamed to data-bs-focus).
+        const popup = this.$target.closest('.s_popup_middle');
+        if (popup && popup.attr('data-focus')) {
+            popup.attr('data-bs-focus', popup.attr('data-focus'));
+            popup[0].removeAttribute('data-focus');
+        }
     },
     /**
      * @override
diff --git a/addons/website/views/snippets/s_popup.xml b/addons/website/views/snippets/s_popup.xml
index 61493434643..56d428b66cb 100644
--- a/addons/website/views/snippets/s_popup.xml
+++ b/addons/website/views/snippets/s_popup.xml
@@ -7,7 +7,7 @@
     their XML definition here as that would hurt the drag and drop feature.
     -->
     <div class="s_popup o_snippet_invisible" data-vcss="001">
-        <div class="modal fade s_popup_middle" style="background-color: var(--black-50) !important;" data-show-after="5000" data-display="afterDelay" data-consents-duration="7" data-focus="false" data-bs-backdrop="false" tabindex="-1" role="dialog">
+        <div class="modal fade s_popup_middle" style="background-color: var(--black-50) !important;" data-show-after="5000" data-display="afterDelay" data-consents-duration="7" data-bs-focus="false" data-bs-backdrop="false" tabindex="-1" role="dialog">
             <div class="modal-dialog d-flex">
                 <div class="modal-content oe_structure">
                     <div class="s_popup_close js_close_popup o_we_no_overlay o_not_editable" aria-label="Close">&#215;</div>
diff --git a/addons/website_mass_mailing/views/snippets_templates.xml b/addons/website_mass_mailing/views/snippets_templates.xml
index 741affa0e2b..9e375cfa615 100644
--- a/addons/website_mass_mailing/views/snippets_templates.xml
+++ b/addons/website_mass_mailing/views/snippets_templates.xml
@@ -149,7 +149,7 @@
         <div class="modal fade s_popup_middle o_newsletter_modal"
              style="background-color: var(--black-50) !important;"
              data-show-after="5000" data-display="afterDelay" data-consents-duration="7"
-             data-focus="false" data-bs-backdrop="false" tabindex="-1" role="dialog">
+             data-bs-focus="false" data-bs-backdrop="false" tabindex="-1" role="dialog">
             <div class="modal-dialog d-flex">
                 <div class="modal-content oe_structure">
                     <div class="s_popup_close js_close_popup o_we_no_overlay o_not_editable" aria-label="Close">&#215;</div>