diff --git a/users/admin.py b/users/admin.py
index d2e7cac9cda39bc9169098b90e87182b9559c76e..59aad42d2495099bb0e0bfedb9fba8d835beeb5e 100644
--- a/users/admin.py
+++ b/users/admin.py
@@ -1,7 +1,19 @@
 from django.contrib import admin
+from django.contrib.auth import admin as auth_admin
+from django.contrib.auth import models as auth_models
 
 from shared.admin import MarkdownxGuardedModelAdmin
 
 from .models import User
 
+
+class GroupAdmin(auth_admin.GroupAdmin):
+    filter_horizontal = ("permissions",)
+
+    list_filter = ("permissions",)
+
+
+admin.site.unregister(auth_models.Group)
+
 admin.site.register(User, MarkdownxGuardedModelAdmin)
+admin.site.register(auth_models.Group, GroupAdmin)