diff --git a/odoo/addons/base/models/res_users.py b/odoo/addons/base/models/res_users.py
index b57556f7f7a..cbfc6616563 100644
--- a/odoo/addons/base/models/res_users.py
+++ b/odoo/addons/base/models/res_users.py
@@ -1471,7 +1471,12 @@ class UsersView(models.Model):
             if is_boolean_group(f):
                 values[f] = get_boolean_group(f) in gids
             elif is_selection_groups(f):
-                selected = [gid for gid in get_selection_groups(f) if gid in gids]
+                # determine selection groups, in order
+                sel_groups = self.env['res.groups'].sudo().browse(get_selection_groups(f))
+                sel_order = {g: len(g.trans_implied_ids & sel_groups) for g in sel_groups}
+                sel_groups = sel_groups.sorted(key=sel_order.get)
+                # determine which ones are in gids
+                selected = [gid for gid in sel_groups.ids if gid in gids]
                 # if 'Internal User' is in the group, this is the "User Type" group
                 # and we need to show 'Internal User' selected, not Public/Portal.
                 if self.env.ref('base.group_user').id in selected:
diff --git a/odoo/addons/base/tests/test_res_users.py b/odoo/addons/base/tests/test_res_users.py
index 34f21356abe..fa93dca0407 100644
--- a/odoo/addons/base/tests/test_res_users.py
+++ b/odoo/addons/base/tests/test_res_users.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
+from odoo.addons.base.models.res_users import is_selection_groups, get_selection_groups
 from odoo.tests.common import TransactionCase, Form, tagged
 
 
@@ -129,3 +130,44 @@ class TestUsers2(TransactionCase):
         user = f.save()
 
         self.assertIn(self.env.ref('base.group_user'), user.groups_id)
+
+    def test_selection_groups(self):
+        # create 3 groups that should be in a selection
+        app = self.env['ir.module.category'].create({'name': 'Foo'})
+        group1, group2, group0 = self.env['res.groups'].create([
+            {'name': name, 'category_id': app.id}
+            for name in ('User', 'Manager', 'Visitor')
+        ])
+        # THIS PART IS NECESSARY TO REPRODUCE AN ISSUE: group1.id < group2.id < group0.id
+        self.assertLess(group1.id, group2.id)
+        self.assertLess(group2.id, group0.id)
+        # implication order is group0 < group1 < group2
+        group2.implied_ids = group1
+        group1.implied_ids = group0
+        groups = group0 + group1 + group2
+
+        # determine the name of the field corresponding to groups
+        fname = next(
+            name
+            for name in self.env['res.users'].fields_get()
+            if is_selection_groups(name) and group0.id in get_selection_groups(name)
+        )
+        self.assertCountEqual(get_selection_groups(fname), groups.ids)
+
+        # create a user
+        user = self.env['res.users'].create({'name': 'foo', 'login': 'foo'})
+
+        # put user in group0, and check field value
+        user.write({fname: group0.id})
+        self.assertEqual(user.groups_id & groups, group0)
+        self.assertEqual(user.read([fname])[0][fname], group0.id)
+
+        # put user in group1, and check field value
+        user.write({fname: group1.id})
+        self.assertEqual(user.groups_id & groups, group0 + group1)
+        self.assertEqual(user.read([fname])[0][fname], group1.id)
+
+        # put user in group2, and check field value
+        user.write({fname: group2.id})
+        self.assertEqual(user.groups_id & groups, groups)
+        self.assertEqual(user.read([fname])[0][fname], group2.id)