diff --git a/runbot/views/dashboard_views.xml b/runbot/views/dashboard_views.xml
index c891ea5f..2df882b8 100644
--- a/runbot/views/dashboard_views.xml
+++ b/runbot/views/dashboard_views.xml
@@ -52,7 +52,7 @@
             <group>
               <field name="name"/>
               <field name="ownership_ids">
-                <tree>
+                <tree editable="bottom">
                   <field name="team_id"/>
                   <field name="is_fallback"/>
                 </tree>
@@ -74,6 +74,18 @@
         </field>
     </record>
 
+    <record id="module_ownership_tree" model="ir.ui.view">
+      <field name="name">runbot.module.ownership.tree</field>
+        <field name="model">runbot.module.ownership</field>
+        <field name="arch" type="xml">
+            <tree string="Runbot modules ownership" editable="bottom">
+              <field name="team_id"/>
+              <field name="module_id"/>
+              <field name="is_fallback"/>
+            </tree>
+        </field>
+    </record>
+
     <record id="dashboard_form" model="ir.ui.view">
         <field name="name">runbot.dashboard.form</field>
         <field name="model">runbot.dashboard</field>
@@ -169,5 +181,11 @@
       <field name="view_mode">tree,form</field>
     </record>
 
+    <record id="open_view_runbot_module_ownership" model="ir.actions.act_window">
+      <field name="name">Runbot modules ownership</field>
+      <field name="res_model">runbot.module.ownership</field>
+      <field name="view_mode">tree,form</field>
+    </record>
+
   </data>
 </odoo>
diff --git a/runbot/views/menus.xml b/runbot/views/menus.xml
index 9f2b1950..4734b1cc 100644
--- a/runbot/views/menus.xml
+++ b/runbot/views/menus.xml
@@ -19,6 +19,8 @@
     <menuitem id="runbot_menu_job_config_tree" parent="runbot_menu_configs" sequence="10" action="open_view_job_config_tree"/>
     <menuitem id="runbot_menu_job_tree" parent="runbot_menu_configs" sequence="20" action="open_view_job_tree"/>
     <menuitem name="CodeOwners" id="runbot_menu_codeowner_tree" parent="runbot_menu_configs" sequence="30" action="open_view_codeowner_tree"/>
+    <menuitem name="Modules" id="runbot_menu_module_tree" parent="runbot_menu_configs" sequence="40" action="open_view_runbot_module"/>
+    <menuitem name="Modules ownership" id="runbot_menu_module_ownership_tree" parent="runbot_menu_configs" sequence="50" action="open_view_runbot_module_ownership"/>
 
     <menuitem id="runbot_menu_upgrade_exceptions_tree" parent="runbot_menu_root" sequence="700" action="open_view_upgrade_exception_tree"/>
 
@@ -30,7 +32,6 @@
 
     <menuitem name="Teams" id="runbot_menu_teams" parent="runbot_menu_root" sequence="1000"/>
     <menuitem name="Teams" id="runbot_menu_team_tree" parent="runbot_menu_teams" sequence="30" action="open_view_runbot_team"/>
-    <menuitem name="Modules" id="runbot_menu_module_tree" parent="runbot_menu_teams" sequence="35" action="open_view_runbot_module"/>
     <menuitem name="Dashboards" id="runbot_menu_runbot_dashboard_tree" parent="runbot_menu_teams" sequence="40" action="open_view_runbot_dashboard"/>
     <menuitem name="Dashboard Tiles" id="runbot_menu_runbot_dashboard_tile_tree" parent="runbot_menu_teams" sequence="50" action="open_view_runbot_dashboard_tile"/>