diff --git a/common/djangoapps/course_modes/admin.py b/common/djangoapps/course_modes/admin.py
index 1b5cdd728d..f2bc35edbb 100644
--- a/common/djangoapps/course_modes/admin.py
+++ b/common/djangoapps/course_modes/admin.py
@@ -181,6 +181,8 @@ class CourseModeAdmin(admin.ModelAdmin):
     """Admin for course modes"""
     form = CourseModeForm
 
+    raw_id_fields = ['course']
+
     fields = (
         'course',
         'mode_slug',