diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 4a61ad3ba35..e0a86e5d9ac 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -663,7 +663,7 @@
                             <group>
                                 <group name="sale_shipping">
                                     <label for="commitment_date" string="Delivery Date"/>
-                                    <div class="o_row">
+                                    <div name="commitment_date_div" class="o_row">
                                         <field name="commitment_date"/> <span class="text-muted">Expected: <field name="expected_date" widget="date"/></span>
                                     </div>
                                 </group>
diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml
index 7a50cfa7cf8..ef9b076fabd 100644
--- a/addons/sale_stock/views/sale_order_views.xml
+++ b/addons/sale_stock/views/sale_order_views.xml
@@ -29,7 +29,11 @@
                     <field name="show_json_popover" invisible="1"/>
                     <field string=" " name="json_popover" widget="stock_rescheduling_popover" attrs="{'invisible': [('show_json_popover', '=', False)]}"/>
                 </xpath>
-                <xpath expr="//group[@name='sale_shipping']" position="inside">
+                <xpath expr="//div[@name='commitment_date_div']" position="replace">
+                    <div class="o_row">
+                        <field name="commitment_date"/>
+                        <span class="text-muted" attrs="{'invisible': [('effective_date', '!=', False), ('commitment_date', '!=', False)]}">Expected: <field name="expected_date" widget="date"/></span>
+                    </div>
                     <field name="effective_date" attrs="{'invisible': [('effective_date', '=', False)]}"/>
                 </xpath>
                 <xpath expr="//page/field[@name='order_line']/form/group/group/field[@name='price_unit']" position="before">