diff --git a/openedx/features/content_type_gating/admin.py b/openedx/features/content_type_gating/admin.py
index bb27e9aaea..db802e9716 100644
--- a/openedx/features/content_type_gating/admin.py
+++ b/openedx/features/content_type_gating/admin.py
@@ -36,5 +36,6 @@ class ContentTypeGatingConfigAdmin(StackedConfigModelAdmin):
             ),
         })
     )
+    raw_id_fields = ('course',)
 
 admin.site.register(ContentTypeGatingConfig, ContentTypeGatingConfigAdmin)
diff --git a/openedx/features/course_duration_limits/admin.py b/openedx/features/course_duration_limits/admin.py
index 1686c5bb38..64b9149e08 100644
--- a/openedx/features/course_duration_limits/admin.py
+++ b/openedx/features/course_duration_limits/admin.py
@@ -36,5 +36,6 @@ class CourseDurationLimitConfigAdmin(StackedConfigModelAdmin):
             ),
         })
     )
+    raw_id_fields = ('course',)
 
 admin.site.register(CourseDurationLimitConfig, CourseDurationLimitConfigAdmin)