diff --git a/addons/coupon/__manifest__.py b/addons/coupon/__manifest__.py
index 84798bd6969..bc60daf3e21 100644
--- a/addons/coupon/__manifest__.py
+++ b/addons/coupon/__manifest__.py
@@ -21,9 +21,4 @@
         'demo/coupon_demo.xml',
     ],
     'installable': True,
-    'assets': {
-        'web.assets_backend': [
-            'coupon/static/**/*',
-        ],
-    }
 }
diff --git a/addons/coupon/static/src/js/coupon.js b/addons/coupon/static/src/js/coupon.js
deleted file mode 100644
index 8e2b01b8a3c..00000000000
--- a/addons/coupon/static/src/js/coupon.js
+++ /dev/null
@@ -1,30 +0,0 @@
-odoo.define("coupon.CouponGenerateWizard", function (require) {
-    "use strict";
-
-    const FormController = require('web.FormController');
-    const FormView = require('web.FormView');
-    const viewRegistry = require('web.view_registry');
-
-    const CouponGenerateFormController = FormController.extend({
-
-        /**
-         * Display the domain selector popover outside the modal without scroll on modal.
-         * @override
-         */
-        on_attach_callback() {
-            this._super(...arguments);
-            this.el.closest('.modal-body').style.overflow = 'visible';
-        },
-    });
-
-    const couponGenerateWizard = FormView.extend({
-        config: _.extend({}, FormView.prototype.config, {
-            Controller: CouponGenerateFormController,
-        }),
-    });
-
-    viewRegistry.add('coupons_generate_form', couponGenerateWizard);
-
-    return couponGenerateWizard;
-
-});
diff --git a/addons/coupon/wizard/coupon_generate_views.xml b/addons/coupon/wizard/coupon_generate_views.xml
index 55bff911d4c..3233b5350ef 100644
--- a/addons/coupon/wizard/coupon_generate_views.xml
+++ b/addons/coupon/wizard/coupon_generate_views.xml
@@ -4,7 +4,7 @@
         <field name="name">coupon.generate.wizard.form</field>
         <field name="model">coupon.generate.wizard</field>
         <field name="arch" type="xml">
-            <form string="Generate Coupons" js_class="coupons_generate_form">
+            <form string="Generate Coupons">
                 <group>
                     <field name="has_partner_email" invisible="1"/>
                     <field name="generation_type" widget="radio"/>
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index af800d4f708..77d52fd61b5 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -3321,6 +3321,16 @@ var FieldDomain = AbstractField.extend({
 
         this._setState();
     },
+    /**
+     * We use the on_attach_callback hook here when widget is attached to the DOM, so that
+     * the inline 'DomainSelector' widget allows field selector to overflow if widget is
+     * attached within a modal.
+     */
+    on_attach_callback() {
+        if (this.domainSelector && !this.inDialog) {
+            this.domainSelector.on_attach_callback();
+        }
+    },
 
     //--------------------------------------------------------------------------
     // Public
diff --git a/addons/web/static/src/js/widgets/domain_selector.js b/addons/web/static/src/js/widgets/domain_selector.js
index 9fe71ce163f..79c22126593 100644
--- a/addons/web/static/src/js/widgets/domain_selector.js
+++ b/addons/web/static/src/js/widgets/domain_selector.js
@@ -477,6 +477,16 @@ var DomainSelector = DomainTree.extend({
             }
         });
     },
+    /**
+     * If 'DomainSelector' is attached within modal, the modal should have
+     * visible overflow to allow user to see fields drop-down.
+     */
+    on_attach_callback() {
+        let $modalBodyEl = this.$el.closest('.modal-body');
+        if ($modalBodyEl.length !== 0) {
+            $modalBodyEl.css('overflow', 'visible');
+        }
+    },
 
     //--------------------------------------------------------------------------
     // Public
diff --git a/addons/web/static/tests/widgets/domain_selector_tests.js b/addons/web/static/tests/widgets/domain_selector_tests.js
index a587117f95a..784a7c632f5 100644
--- a/addons/web/static/tests/widgets/domain_selector_tests.js
+++ b/addons/web/static/tests/widgets/domain_selector_tests.js
@@ -244,6 +244,35 @@ QUnit.module('DomainSelector', {
 
         domainSelector.destroy();
     });
+
+    QUnit.test("inline domain editor in modal", async function (assert) {
+        assert.expect(1);
+        const actions = [
+            {
+                id: 5,
+                name: "Partner Form",
+                res_model: "partner",
+                target: "new",
+                type: "ir.actions.act_window",
+                views: [["view_ref", "form"]],
+            },
+        ];
+        const actionManager = await testUtils.createActionManager({
+            actions,
+            archs: {
+                "partner,view_ref,form": `
+                    <form>
+                        <field name="foo" string="Domain" widget="domain" options="{'model': 'partner'}"/>
+                    </form>
+                `,
+            },
+            data: this.data,
+        });
+        await actionManager.doAction(5);
+        assert.strictEqual(document.querySelector('div[name="foo"]').closest('.modal-body').style.overflow,
+            'visible', "modal should have visible overflow if there is inline domain field widget");
+        actionManager.destroy();
+    });
 });
 });
 });