diff --git a/enterprise_catalog/apps/academy/admin.py b/enterprise_catalog/apps/academy/admin.py
index 893e4b0b9..6fa83b635 100644
--- a/enterprise_catalog/apps/academy/admin.py
+++ b/enterprise_catalog/apps/academy/admin.py
@@ -14,6 +14,7 @@ class TagAdmin(admin.ModelAdmin):
     """
     list_display = ('id', 'title', )
     search_fields = ('title', )
+    filter_horizontal = ('content_metadata',)
 
 
 @admin.register(Academy)
@@ -23,3 +24,4 @@ class AcademyAdmin(SimpleHistoryAdmin):
     """
     list_display = ('uuid', 'title', 'created', 'modified', )
     search_fields = ('title', 'short_description', 'long_description', )
+    filter_horizontal = ('enterprise_catalogs', 'tags', )