diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index fe4d2a5790a..b0b395f46ac 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -206,6 +206,16 @@ class PickingType(models.Model):
         if self.show_operations and self.code != 'incoming':
             self.show_reserved = True
 
+    @api.model
+    def action_view_picking_type(self):
+        action = self.env["ir.actions.actions"]._for_xml_id("stock.stock_picking_type_action")
+        if self.user_has_groups('stock.group_stock_multi_locations'):
+            context = literal_eval(action['context'])
+            context['search_default_groupby_warehouse_id'] = True
+            action['context'] = context
+
+        return action
+
     def _get_action(self, action_xmlid):
         action = self.env["ir.actions.actions"]._for_xml_id(action_xmlid)
         if self:
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 4d8977f54d6..848c1101031 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -97,6 +97,16 @@
             </field>
         </record>
 
+        <record id="stock_picking_type_menu_action" model="ir.actions.server">
+            <field name="name">Overview</field>
+            <field name="model_id" ref="stock.model_stock_picking_type"/>
+            <field name="groups_id" eval="[(4, ref('stock.group_stock_user'))]"/>
+            <field name="state">code</field>
+            <field name="code">
+                action = model.action_view_picking_type()
+            </field>
+        </record>
+
         <record id="action_picking_type_list" model="ir.actions.act_window">
             <field name="name">Operations Types</field>
             <field name="res_model">stock.picking.type</field>
@@ -113,7 +123,7 @@
         </record>
 
         <menuitem
-            action="stock_picking_type_action"
+            action="stock_picking_type_menu_action"
             id="stock_picking_type_menu"
             parent="menu_stock_root" sequence="0"
             name="Overview"/>