diff --git a/files/forms.py b/files/forms.py
index 77a30b88..e615f54a 100644
--- a/files/forms.py
+++ b/files/forms.py
@@ -5,7 +5,7 @@ from django import forms
 from django.conf import settings
 
 from .methods import get_next_state, is_mediacms_editor
-from .models import MEDIA_STATES, Category, Media, Subtitle
+from .models import MEDIA_STATES, Category, Media, Subtitle, Tag
 from .widgets import CategoryModalWidget
 
 
@@ -294,6 +294,10 @@ class MediaPublishForm(forms.ModelForm):
 
         media = super(MediaPublishForm, self).save(*args, **kwargs)
 
+        for course in media.category.filter(is_lms_course=True):
+            tag, _ = Tag.objects.get_or_create(title=course.title[:100])
+            media.tags.add(tag)
+
         return media