diff --git a/base_custom_info/models/custom_info.py b/base_custom_info/models/custom_info.py
index 1594d2ae5..fc805b828 100644
--- a/base_custom_info/models/custom_info.py
+++ b/base_custom_info/models/custom_info.py
@@ -59,7 +59,6 @@ class CustomInfo(models.AbstractModel):
                 "res_id": self.id,
                 "value": prop.default_value,
             })
-            # HACK https://github.com/odoo/odoo/issues/13076
             newvalue._inverse_value()
             newvalue._compute_value()
             values += newvalue
diff --git a/base_custom_info/models/custom_info_value.py b/base_custom_info/models/custom_info_value.py
index 8bc80abe6..2bc9ed522 100644
--- a/base_custom_info/models/custom_info_value.py
+++ b/base_custom_info/models/custom_info_value.py
@@ -65,7 +65,7 @@ class CustomInfoValue(models.Model):
     value_bool = fields.Boolean(string="Yes/No value", index=True)
     value_id = fields.Many2one(
         comodel_name="custom.info.option", string="Selection value",
-        ondelete="cascade", domain="[('property_ids', 'in', [property_id])]",
+        ondelete="cascade", domain="[('property_ids', '=', property_id)]",
     )
 
     @api.multi
diff --git a/base_custom_info/views/custom_info_value_view.xml b/base_custom_info/views/custom_info_value_view.xml
index d9fdff38a..abc662b28 100644
--- a/base_custom_info/views/custom_info_value_view.xml
+++ b/base_custom_info/views/custom_info_value_view.xml
@@ -9,11 +9,17 @@
         <field name="arch" type="xml">
             <tree string="Custom Property Values" create="0" delete="0">
                 <field name="owner_id" />
-                <field name="property_id"/>
-                <field name="category_id"/>
+                <field name="property_id" force_save="1"/>
+                <field name="category_id" force_save="1"/>
                 <field name="required" invisible="1"/>
+                <field name="field_type" invisible="1"/>
                 <field name="value"
-                       attrs="{'required': [('required', '=', True)]}"
+                    attrs="{'invisible': [('field_type', '=', 'id')], 'required': [('required', '=', True), ('field_type', '!=', 'id')]}"
+                />
+                <field name="value_id"
+                    force_save="1"
+                    options="{'no_create': True, 'no_open': True}"
+                    attrs="{'invisible': [('field_type', '!=', 'id')], 'required': [('required', '=', True), ('field_type', '=', 'id')]}"
                 />
             </tree>
         </field>
@@ -29,13 +35,6 @@
                 <attribute name="editable">bottom</attribute>
             </tree>
             <field name="owner_id" position="replace" />
-            <field name="value" position="after">
-                <field name="field_type" invisible="1"/>
-                <field name="value_id"
-                       widget="selection"
-                       attrs="{'invisible': [('field_type', '!=', 'id')], 'required': [('required', '=', True), ('field_type', '=', 'id')]}"
-                />
-            </field>
         </field>
     </record>