diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index 2f9c4badc83..1d8166d7139 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -38,14 +38,15 @@
                         <field name="property_cost_method" invisible="1"/>
                     </field>
                     <field name="standard_price" position="replace">
-                        <div class="o_row">
-                            <field name="standard_price"
-                                attrs="{'readonly':[('valuation','=','real_time')]}"
-                                widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}" />
+                        <field name="standard_price"
+                            attrs="{'readonly':[('valuation','=','real_time')]}"
+                            widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}"
+                            class="pull-left"/>
+                        <div name="update_cost_price" class="col-md-2">
                             <button string="Update Cost" type="action"
                             name="%(action_view_change_standard_price)d"
                             attrs="{'invisible':['|', '|', ('valuation','!=', 'real_time'), ('cost_method', 'not in', ['average', 'standard']), ('product_variant_count', '>', 1)]}"
-                            class="oe_link oe_read_only" colspan="2"/>
+                            class="oe_link oe_read_only"/>
                         </div>
                     </field>
                     <group name="accounting" position="inside">
@@ -71,17 +72,18 @@
                         <field name="valuation" invisible="1"/>
                         <field name="cost_method" invisible="1"/>
                     </field>
-                    <field name="standard_price" position="after">
-                        <button string="Set standard cost" type="action"
-                            name="%(action_view_change_standard_price)d"
-                            attrs="{'invisible':['|',('valuation','!=', 'real_time'), ('cost_method', 'not in', ['standard'])]}"
-                            class="oe_link oe_read_only" colspan="2"/>
-                    </field>
-                    <field name="standard_price" position="after">
-                        <button string="Set standard cost" type="action"
-                            name="%(action_view_change_standard_price)d"
-                            attrs="{'invisible':['|',('valuation','!=', 'real_time'), ('cost_method', 'not in', ['average'])]}"
-                            class="oe_link oe_read_only" colspan="2"/>
+                    <field name="standard_price" position="replace">
+                        <div name="standard_price_div">
+                            <field name="standard_price"
+                                attrs="{'readonly':[('valuation','=','real_time')]}"
+                                widget='monetary' options="{'currency_field': 'currency_id', 'field_digits': True}" class="pull-left"/>
+                            <div name="update_cost_price" class="col-md-2">
+                                <button string="Update Cost" type="action"
+                                name="%(action_view_change_standard_price)d"
+                                attrs="{'invisible':['|',('valuation','!=', 'real_time'), ('cost_method', 'not in', ['standard', 'average'])]}"
+                                class="oe_link oe_read_only" colspan="2"/>
+                            </div>
+                        </div>
                     </field>
                 </data>
             </field>