diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 00e925fd6a0..e9fedb90194 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -81,6 +81,7 @@
                                         <field name="type"/>
                                         <field name="uom_id" on_change="onchange_uom(uom_id,uom_po_id)" groups="product.group_uom"/>
                                         <field name="list_price"/>
+                                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                                     </group>
                                     <group>
                                         <field name="default_code"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 747736949f7..e52a0181206 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -110,16 +110,11 @@
                     </group>
                 </group>
                 <group name="status" position="after" version="7.0">
-                    <div>
-                        <separator string="Storage Location" attrs="{'invisible':[('type','=','service')]}"/>
-                        <separator string="Location" groups="base.group_multi_company" attrs="{'invisible':[('type','!=','service')]}"/>
-                        <group name="store">
-                            <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                            <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
-                            <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
-                            <field name="loc_case" attrs="{'invisible':[('type','=','service')]}"/>
-                        </group>
-                    </div>
+                    <group name="store" string="Storage Location" attrs="{'invisible':[('type','=','service')]}">
+                        <field name="loc_rack"/>
+                        <field name="loc_row"/>
+                        <field name="loc_case"/>
+                    </group>
                 </group>
                 <group name="Weights" position="after">
                      <group name="store" groups="stock.group_locations" string="Counter-Part Locations Properties">