diff --git a/includes/media.pages.inc b/includes/media.pages.inc
index b22a8b1..349f474 100644
--- a/includes/media.pages.inc
+++ b/includes/media.pages.inc
@@ -13,6 +13,7 @@ function media_file_edit_modal($form, &$form_state, $file, $js) {
   ctools_include('ajax');
 
   $form_state['ajax'] = $js;
+  $form_state['#upload_options'] = media_get_browser_params();
   form_load_include($form_state, 'inc', 'file_entity', 'file_entity.pages');
 
   $output = ctools_modal_form_wrapper('file_entity_edit', $form_state);
diff --git a/media.module b/media.module
index 1f97bcb..2a5aea1 100644
--- a/media.module
+++ b/media.module
@@ -794,6 +794,9 @@ function media_element_process($element, &$form_state, $form) {
         'ctools-modal-media-file-edit', 'button', 'edit',
       ),
     ),
+    '#options' => array(
+      'query' => $element['#media_options']['global'],
+    ),
     '#weight' => 20,
     '#access' => $element['#file'] ? file_entity_access('update', $element['#file']) : FALSE,
   );