diff --git a/agreement_repair/views/agreement_view.xml b/agreement_repair/views/agreement_view.xml
index 6f318241..0c6c5562 100644
--- a/agreement_repair/views/agreement_view.xml
+++ b/agreement_repair/views/agreement_view.xml
@@ -24,7 +24,6 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(action_mrp_repair_agreement_specific)d"
                         type="action"
-                        attrs="{'invisible': [('repair_count', '=', 0)]}"
                         class="oe_stat_button" icon="fa-wrench">
                     <div class="o_field_widget o_stat_info">
                         <span class="o_stat_value">
diff --git a/agreement_repair/views/repair_view.xml b/agreement_repair/views/repair_view.xml
index 0a052d91..9f0ffd44 100644
--- a/agreement_repair/views/repair_view.xml
+++ b/agreement_repair/views/repair_view.xml
@@ -7,7 +7,8 @@
         <field name="inherit_id" ref="mrp_repair.view_repair_order_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='product_id']" position="before">
-                <field name="agreement_id"/>
+                <field name="agreement_id"
+                       domain="[('partner_id', '=', partner_id)]"/>
                 <field name="serviceprofile_id"
                        domain="[('agreement_id', '=', agreement_id)]"/>
             </xpath>