diff --git a/src/Umbraco.Web.UI/config/tinyMceConfig.config b/src/Umbraco.Web.UI/config/tinyMceConfig.config
index 78716ed50b..3b3625b622 100644
--- a/src/Umbraco.Web.UI/config/tinyMceConfig.config
+++ b/src/Umbraco.Web.UI/config/tinyMceConfig.config
@@ -167,12 +167,11 @@
             <priority>63</priority>
         </command>
         <command>
-            <umbracoAlias>media</umbracoAlias>
-            <icon>images/editor/media.gif</icon>
-            <tinyMceCommand value="" userInterface="true" frontendCommand="media">media</tinyMceCommand>
-            <priority>65</priority>
+          <umbracoAlias>umbracoembed</umbracoAlias>
+          <icon>images/editor/media.gif</icon>
+          <tinyMceCommand value="" userInterface="true" frontendCommand="mceUmbracoEmbed">umbracoembed</tinyMceCommand>
+          <priority>66</priority>
         </command>
-
         <command>
             <umbracoAlias>inserthorizontalrule</umbracoAlias>
             <icon>images/editor/hr.gif</icon>
@@ -216,7 +215,8 @@
         <!--<plugin loadOnFrontend="false">advimage</plugin>-->
         <plugin loadOnFrontend="false">advlink</plugin>
         <plugin loadOnFrontend="false">umbracocss</plugin>
-        <plugin loadOnFrontend="false">media</plugin>
+        <plugin loadOnFrontend="false">umbracoembed</plugin>  
+        <!--<plugin loadOnFrontend="false">media</plugin>-->
         <plugin loadOnFrontend="false">umbracoimg</plugin>
         <plugin loadOnFrontend="false">spellchecker</plugin>
         <plugin loadOnFrontend="false">umbracoshortcut</plugin>