diff --git a/lib/editor/tinymce/lib.php b/lib/editor/tinymce/lib.php
index b07e85c8377..9cb5b5dea10 100644
--- a/lib/editor/tinymce/lib.php
+++ b/lib/editor/tinymce/lib.php
@@ -88,6 +88,7 @@ class tinymce_texteditor extends texteditor {
             }
         }
 
+        $xmedia = 'media, ';
         $filters = filter_get_active_in_context($context);
         if (array_key_exists('filter/tex', $filters)) {
             $xdragmath = 'dragmath,';
diff --git a/lib/editor/tinymce/plugins/media/media.htm b/lib/editor/tinymce/plugins/media/media.htm
index 911c03dcc59..37c778b0924 100644
--- a/lib/editor/tinymce/plugins/media/media.htm
+++ b/lib/editor/tinymce/plugins/media/media.htm
@@ -29,7 +29,7 @@
 								<td><label for="media_type">{#media_dlg.type}</label></td>
 								<td>
 									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">
-										<option value="flash">Flash</option>
+										<option value="flash">Flash/Youtube</option>
 										<!-- <option value="flv">Flash video (FLV)</option> -->
 										<option value="qt">Quicktime</option>
 										<option value="shockwave">Shockwave</option>