diff --git a/includes/media.browser.inc b/includes/media.browser.inc
index d5285f0..04e11e2 100644
--- a/includes/media.browser.inc
+++ b/includes/media.browser.inc
@@ -14,6 +14,16 @@ function media_browser($selected = NULL) {
 
   $params = media_get_browser_params();
 
+  // If we just did a multiple upload, do the multiform file edit. The flag that
+  // tells us that we need to do this is $params['render_multi_edit_form'].
+  if (isset($params['render_multi_edit_form']) && isset($params['fid']) && module_exists('media_bulk_upload')) {
+    module_load_include('inc', 'media_bulk_upload', 'includes/media_bulk_upload.pages');
+    $files = file_load_multiple($params['fid']);
+    $multi_edit_form = media_bulk_upload_file_page_edit_multiple($files);
+    $multi_edit_form['buttons']['cancel']['#access'] = FALSE;
+    return $multi_edit_form;
+  }
+
   // If one or more files have been selected, the browser interaction is now
   // complete. Return empty page content to the dialog which now needs to close,
   // but populate Drupal.settings with information about the selected files.
diff --git a/modules/media_bulk_upload/media_bulk_upload.module b/modules/media_bulk_upload/media_bulk_upload.module
index 9bd0d7a..3d2cc97 100644
--- a/modules/media_bulk_upload/media_bulk_upload.module
+++ b/modules/media_bulk_upload/media_bulk_upload.module
@@ -97,6 +97,9 @@ function media_bulk_upload_browser_form_submit($form, &$form_state) {
     $files = $form_state['files'];
     $url = 'media/browser';
     $parameters = array('query' => array('render' => 'media-popup', 'fid' => array_keys($files)));
+    // Pass in "render_multi_edit_form" as a parameter to signal to the
+    // media_browser() function that we need to edit multiple files.
+    $parameters['query']['render_multi_edit_form'] = TRUE;
   }
 
   // If $url is set, we had some sort of upload, so redirect the form.
@@ -106,6 +109,37 @@ function media_bulk_upload_browser_form_submit($form, &$form_state) {
 }
 
 /**
+ * Implements hook_multiform_get_form_alter().
+ *
+ * Alter the multiform that is used after uploading multiple files.
+ */
+function media_bulk_upload_multiform_get_form_alter($form_state_save, &$redirect, $all_args) {
+
+  // Was this form submitted while in the Media browser?
+  if (isset($redirect['#media_browser']) && !empty($form_state_save['input'])) {
+
+    // The $all_args should be an array of arrays, with the second element of
+    // the inner array being the file. For details on this structure, see
+    // the media_bulk_upload_file_page_edit_multiple() function.
+    $fids = array();
+    foreach ($all_args as $arg) {
+      if (count($arg) == 2) {
+        $file = $arg[1];
+        $fids[] = $file->fid;
+      }
+    }
+
+    // If we found something, instruct the Media browser to close and attach
+    // the files to whatever they need to be attached to.
+    if (!empty($fids)) {
+      $url = 'media/browser';
+      $parameters = array('query' => array('render' => 'media-popup', 'fid' => $fids));
+      $redirect['redirect'] = array($url, $parameters);
+    }
+  }
+}
+
+/**
  * Return a URL for editing an files.
  *
  * Works with an array of fids or a single fid.