diff --git a/addons/stock/models/stock_location.py b/addons/stock/models/stock_location.py
index 5cb1083d950..8437f1b7e68 100644
--- a/addons/stock/models/stock_location.py
+++ b/addons/stock/models/stock_location.py
@@ -78,7 +78,7 @@ class Location(models.Model):
     next_inventory_date = fields.Date("Next Expected Inventory", compute="_compute_next_inventory_date", store=True, help="Date for next planned inventory based on cyclic schedule.")
     warehouse_view_ids = fields.One2many('stock.warehouse', 'view_location_id', readonly=True)
     warehouse_id = fields.Many2one('stock.warehouse', compute='_compute_warehouse_id')
-    storage_category_id = fields.Many2one('stock.storage.category', string='Storage Category')
+    storage_category_id = fields.Many2one('stock.storage.category', string='Storage Category', check_company=True)
     outgoing_move_line_ids = fields.One2many('stock.move.line', 'location_id', help='Technical: used to compute weight.')
     incoming_move_line_ids = fields.One2many('stock.move.line', 'location_dest_id', help='Technical: used to compute weight.')
     net_weight = fields.Float('Net Weight', compute="_compute_weight")
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index 4aaf7d14416..3ac7aed0c3e 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -175,5 +175,11 @@
         <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
+    <record model="ir.rule" id="stock_storage_category_rule">
+        <field name="name">stock_storage_category multi-company</field>
+        <field name="model_id" ref="model_stock_storage_category"/>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+    </record>
+
 </data>
 </odoo>
diff --git a/addons/stock/views/stock_storage_category_views.xml b/addons/stock/views/stock_storage_category_views.xml
index 1ddb4c4c580..481dc1f3348 100644
--- a/addons/stock/views/stock_storage_category_views.xml
+++ b/addons/stock/views/stock_storage_category_views.xml
@@ -25,7 +25,7 @@
                     </group>
                     <notebook>
                         <page string="Capacity by Package" name="package_capacity" groups="stock.group_tracking_lot">
-                            <field name="package_capacity_ids" context="{'default_storage_category_id': id}">
+                            <field name="package_capacity_ids" context="{'default_storage_category_id': id, 'default_company_id': company_id}">
                                 <tree editable="bottom">
                                     <field name="package_type_id" required="1"/>
                                     <field name="quantity"/>
@@ -34,9 +34,9 @@
                             </field>
                         </page>
                         <page string="Capacity by Product" name="product_capacity">
-                            <field name="product_capacity_ids" context="{'default_storage_category_id': id}">
+                            <field name="product_capacity_ids" context="{'default_storage_category_id': id, 'default_company_id': company_id}">
                                 <tree editable="bottom">
-                                    <field name="product_id" required="1"/>
+                                    <field name="product_id" required="1" context="{'default_detailed_type': 'product'}"/>
                                     <field name="quantity"/>
                                     <field name="product_uom_id" options="{'no_create': True, 'no_open': True}"/>
                                     <field name="company_id" invisible="1"/>