diff --git a/addons/project/views/project_project_views.xml b/addons/project/views/project_project_views.xml
index 2b4c6e5f388..8e6e3ebc939 100644
--- a/addons/project/views/project_project_views.xml
+++ b/addons/project/views/project_project_views.xml
@@ -223,6 +223,18 @@
             </field>
         </record>
 
+        <record id="project_list_view_group_stage" model="ir.ui.view">
+            <field name="name">project.project.tree.group.stage</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="view_project"/>
+            <field name="mode">primary</field>
+            <field name="arch" type="xml">
+                <tree position="attributes">
+                    <attribute name="default_group_by">stage_id</attribute>
+                </tree>
+            </field>
+        </record>
+
         <record id="view_project_config" model="ir.ui.view">
             <field name="name">project.project.tree.config</field>
             <field name="model">project.project</field>
@@ -239,6 +251,18 @@
             </field>
         </record>
 
+        <record id="view_project_config_group_stage" model="ir.ui.view">
+            <field name="name">project.project.tree.config.group.stage</field>
+            <field name="model">project.project</field>
+            <field name="inherit_id" ref="view_project_config"/>
+            <field name="mode">primary</field>
+            <field name="arch" type="xml">
+                <tree position="attributes">
+                    <attribute name="default_group_by">stage_id</attribute>
+                </tree>
+            </field>
+        </record>
+
         <record id="quick_create_project_form" model="ir.ui.view">
             <field name="name">project.form.quick_create</field>
             <field name="model">project.project</field>
@@ -479,6 +503,18 @@
             </field>
         </record>
 
+        <record id="project_kanban_view_group_stage" model="ir.ui.view">
+            <field name="name">project.project.kanban.group.stage</field>
+            <field name="model">project.project</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="view_project_kanban"/>
+            <field name="arch" type="xml">
+                <xpath expr="//kanban" position="attributes">
+                    <attribute name="default_group_by">stage_id</attribute>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_project_config_kanban" model="ir.ui.view">
             <field name="name">project.kanban.inherit.config.project</field>
             <field name="model">project.project</field>
@@ -492,6 +528,18 @@
             </field>
         </record>
 
+        <record id="view_project_config_kanban_group_stage" model="ir.ui.view">
+            <field name="name">project.kanban.inherit.config.project.group.stage</field>
+            <field name="model">project.project</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="view_project_config_kanban"/>
+            <field name="arch" type="xml">
+                <xpath expr="//kanban" position="attributes">
+                    <attribute name="default_group_by">stage_id</attribute>
+                </xpath>
+            </field>
+        </record>
+
         <record id="view_project_calendar" model="ir.ui.view">
             <field name="name">project.project.calendar</field>
             <field name="model">project.project</field>
@@ -539,7 +587,7 @@
         <record id="open_view_project_all_group_stage" model="ir.actions.act_window">
             <field name="name">Projects</field>
             <field name="res_model">project.project</field>
-            <field name="context">{'search_default_groupby_stage': 1}</field>
+            <field name="context">{}</field>
             <field name="domain">[]</field>
             <field name="view_mode">kanban,tree,form,calendar,activity</field>
             <field name="view_id" ref="view_project_kanban"/>
@@ -555,6 +603,19 @@
             </field>
         </record>
 
+        <record id="open_view_project_all_group_stage_kanban_view" model="ir.actions.act_window.view">
+            <field name="sequence" eval="10"/>
+            <field name="view_mode">kanban</field>
+            <field name="act_window_id" ref="open_view_project_all_group_stage"/>
+            <field name="view_id" ref="project_kanban_view_group_stage"/>
+        </record>
+        <record id="open_view_project_all_group_stage_tree_view" model="ir.actions.act_window.view">
+            <field name="sequence" eval="20"/>
+            <field name="view_mode">tree</field>
+            <field name="act_window_id" ref="open_view_project_all_group_stage"/>
+            <field name="view_id" ref="project_list_view_group_stage"/>
+        </record>
+
         <!-- Please update both act_window when modifying one (open_view_project_all_config or open_view_project_all_config_group_stage) as one or the other is used in the menu menu_project_config -->
         <record id="open_view_project_all_config" model="ir.actions.act_window">
             <field name="name">Projects</field>
@@ -598,13 +659,13 @@
             <field name="sequence" eval="10"/>
             <field name="view_mode">tree</field>
             <field name="act_window_id" ref="project.open_view_project_all_config_group_stage"/>
-            <field name="view_id" ref="view_project_config"/>
+            <field name="view_id" ref="view_project_config_group_stage"/>
         </record>
         <record id="open_view_project_all_config_group_stage_kanban_action_view" model="ir.actions.act_window.view">
             <field name="sequence" eval="20"/>
             <field name="view_mode">kanban</field>
             <field name="act_window_id" ref="project.open_view_project_all_config_group_stage"/>
-            <field name="view_id" ref="view_project_config_kanban"/>
+            <field name="view_id" ref="view_project_config_kanban_group_stage"/>
         </record>
 
         <record id="project_view_kanban_inherit_project" model="ir.ui.view">
diff --git a/addons/sale_project/views/project_views.xml b/addons/sale_project/views/project_views.xml
index c2d263f76e0..1cad9a2f5df 100644
--- a/addons/sale_project/views/project_views.xml
+++ b/addons/sale_project/views/project_views.xml
@@ -10,6 +10,6 @@
         <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True}</field>
     </record>
     <record id="project.open_view_project_all_group_stage" model="ir.actions.act_window">
-        <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True, 'search_default_groupby_stage': 1}</field>
+        <field name="context">{'default_allow_billable': True, 'sale_show_partner_name': True}</field>
     </record>
 </odoo>