diff --git a/mrp_bom_configurable/models/mrp_bom_line.py b/mrp_bom_configurable/models/mrp_bom_line.py
index 8ef750a1886..a19de8b0dac 100644
--- a/mrp_bom_configurable/models/mrp_bom_line.py
+++ b/mrp_bom_configurable/models/mrp_bom_line.py
@@ -1,6 +1,6 @@
 import logging
 
-from odoo import fields, models
+from odoo import _, fields, models
 from odoo.tools.safe_eval import safe_eval
 
 logger = logging.getLogger(__name__)
@@ -50,6 +50,18 @@ def execute(self, values):
         if not self.domain:
             return True
         else:
-            domain = safe_eval(self.domain)
+            # TODO need to work with only one '=' here
+            domain = safe_eval(self.domain.replace("=", "=="))
 
             return self.execute_domain(domain, values)
+
+    def ui_update_domain(self):
+        self.ensure_one()
+        return {
+            "name": _(f"Domain for {self.product_id}"),
+            "type": "ir.actions.act_window",
+            "res_model": "mrp.bom.line",
+            "res_id": self.id,
+            "view_mode": "form",
+            "target": "current",
+        }
diff --git a/mrp_bom_configurable/views/mrp_view.xml b/mrp_bom_configurable/views/mrp_view.xml
index fbf35bac729..1384cd907e7 100644
--- a/mrp_bom_configurable/views/mrp_view.xml
+++ b/mrp_bom_configurable/views/mrp_view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
+
     <record id="mrp_bom_form_view" model="ir.ui.view">
         <field name="model">mrp.bom</field>
         <field name="inherit_id" ref="mrp.mrp_bom_form_view" />
@@ -8,10 +9,16 @@
                 <field name="configuration_type" />
             </field>
             <xpath
-                expr="//field[@name='bom_line_ids']/tree/field[@name='product_qty']"
+                expr="//field[@name='bom_line_ids']/tree/field[@name='product_uom_id']"
                 position="after"
             >
-                <field name="domain" />
+                <field name="domain" readonly="1" />
+                <button
+                    name="ui_update_domain"
+                    type="object"
+                    class="oi oi-launch"
+                    title="Update domain"
+                />
                 <field name="condition" />
             </xpath>
         </field>
@@ -56,10 +63,20 @@
         <field name="model">mrp.bom.line</field>
         <field name="inherit_id" ref="mrp.mrp_bom_line_view_form" />
         <field name="arch" type="xml">
-            <field name="product_id" position="after">
-                <field name="domain" />
-                <field name="condition" optional="hide" />
-            </field>
+            <xpath expr="//form" position="attributes">
+                <attribute name="edit">1</attribute>
+            </xpath>
+            <xpath expr="//group" position="after">
+                <group name="domain" string="Domain">
+                    <field
+                        name="domain"
+                        widget="domain"
+                        options="{'model': 'input.line'}"
+                    />
+                    <field name="condition" />
+                </group>
+            </xpath>
         </field>
     </record>
+
 </odoo>