diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index ca453f31632..7a17ff16ac1 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -261,9 +261,10 @@
                         <label for="carrier_id"/>
                         <div>
                             <field name="carrier_id" context="{'order_id':active_id or False}" class="oe_inline"/>
-                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"/>
+                            <button name="delivery_set" states="draft" string="Add to Sale Order" type="object"
+                                attrs="{'invisible':[('carried_id','&lt;&gt;',False)]}"/>
                         </div>
-                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order." colspan="2"
+                        <label string="If you do not 'Add to Sale Order', the delivery charges will be added based on the delivery order(s)." colspan="2"
                              attrs="{'invisible':[('carried_id','&lt;&gt;',False)]}"/>
                     </group>
                 </xpath>