diff --git a/media.install b/media.install
index c88452e..f730deb 100644
--- a/media.install
+++ b/media.install
@@ -560,3 +560,10 @@ function media_update_7016() {
 
   field_cache_clear();
 }
+
+/**
+ * Rebuild the menu to fix access for WYSIWYG.
+ */
+function media_update_7017() {
+  menu_rebuild();
+}
diff --git a/media.module b/media.module
index f4715fb..f7c19c2 100644
--- a/media.module
+++ b/media.module
@@ -181,7 +181,8 @@ function media_menu() {
     'description' => 'Choose a format for a piece of media',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('media_format_form', 1),
-    'access arguments' => array('administer media'),
+    'access callback' => 'media_access',
+    'access arguments' => array('view'),
     'weight' => 0,
     'file' => 'includes/media.filter.inc',
     'theme callback' => 'media_dialog_get_theme_name',
@@ -243,7 +244,7 @@ function media_menu() {
 
   $items['admin/content/media/browser'] = $items['media/browser'];
   $items['admin/content/media/browser']['type'] = MENU_LOCAL_ACTION;
-  
+
   $items['media/js'] = array(
     'page callback' => 'media_preview_ajax',
     'access callback' => 'media_access',