diff --git a/dojo/group/queries.py b/dojo/group/queries.py
index deee04a346a..11a6718bf62 100644
--- a/dojo/group/queries.py
+++ b/dojo/group/queries.py
@@ -1,7 +1,7 @@
 from crum import get_current_user
 from django.db.models import Subquery
 
-from dojo.authorization.authorization import get_roles_for_permission
+from dojo.authorization.authorization import get_roles_for_permission, user_has_configuration_permission
 from dojo.authorization.roles_permissions import Permissions
 from dojo.models import Dojo_Group, Dojo_Group_Member, Product_Group, Product_Type_Group, Role
 from dojo.request_cache import cache_for_request
@@ -18,6 +18,10 @@ def get_authorized_groups(permission):
     if user.is_superuser:
         return Dojo_Group.objects.all().order_by("name")
 
+    # Check for the case of the view_group config permission
+    if user_has_configuration_permission(user, "auth.view_group") or user_has_configuration_permission(user, "auth.add_group"):
+        return Dojo_Group.objects.all().order_by("name")
+
     roles = get_roles_for_permission(permission)
 
     # Get authorized group IDs via subquery