diff --git a/addons/crm/crm_tip_data.xml b/addons/crm/crm_tip_data.xml
index 09abe756801..2e4b910647c 100644
--- a/addons/crm/crm_tip_data.xml
+++ b/addons/crm/crm_tip_data.xml
@@ -19,7 +19,7 @@
             <field name="action_id" ref="base.action_partner_form"/>
             <field name="model">res.partner</field>
             <field name="mode">form</field>
-            <field name="trigger_selector">.oe_form_buttons_view:visible,div.oe_right.oe_button_box > button</field>
+            <field name="trigger_selector">.oe_form_buttons_view:visible:not(.modal-dialog .oe_form_buttons_view:visible), div.oe_right.oe_button_box > button</field>
             <field name="highlight_selector">div.oe_right.oe_button_box:visible > button.o_res_partner_tip_opp</field>
             <field name="placement">bottom</field>
         </record>
@@ -40,10 +40,9 @@
             <field name="description"><![CDATA[You can change the stage of your opportunities by simply <b>drag and dropping</b> the opportunity in another column.]]></field>
             <field name="model">crm.lead</field>
             <field name="mode">kanban</field>
-            <field name="trigger_selector">div.oe_kanban_record:visible</field>
-            <field name="highlight_selector">div.oe_kanban_record:visible:first</field>
-            <field name="end_selector">.oe_kanban_record</field>
-            <field name="end_event">mouseup</field>
+            <field name="trigger_selector">.oe_kanban_record:visible</field>
+            <field name="highlight_selector">.oe_kanban_record:visible</field>
+            <field name="end_event">mousedown</field>
             <field name="placement">auto top</field>
         </record>