diff --git a/includes/media.admin.inc b/includes/media.admin.inc
index 9cc9fa1..8172d3c 100644
--- a/includes/media.admin.inc
+++ b/includes/media.admin.inc
@@ -120,6 +120,19 @@ function media_admin_config_browser($form, &$form_state) {
     '#description' => t('CSS property opacity; used with overlay.'),
   );
 
+  $form['bulk_upload'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Bulk Upload'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
+
+  $form['bulk_upload']['bulk_upload_edit'] = array(
+    '#type' => 'checkbox',
+    '#title' => t("Bulk upload edit"),
+    '#description' => t("be re-directed to an edit page after bulk upload on a node edit page"),
+    '#default_value' => variable_get('bulk_upload_edit', TRUE),
+  );
   $form['#submit'][] = 'media_admin_config_browser_pre_submit';
 
   return system_settings_form($form);
diff --git a/includes/media.browser.inc b/includes/media.browser.inc
index 04e11e2..23c5556 100644
--- a/includes/media.browser.inc
+++ b/includes/media.browser.inc
@@ -16,7 +16,7 @@ function media_browser($selected = NULL) {
 
   // 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')) {
+  if (variable_get('bulk_upload_edit', TRUE), 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);
diff --git a/media.install b/media.install
index e18593a..451d3a0 100644
--- a/media.install
+++ b/media.install
@@ -65,6 +65,8 @@ function media_uninstall() {
   variable_del('media_zindex');
   variable_del('media_backgroundcolor');
   variable_del('media_opacity');
+  // bulk edit option
+  variable_del('bulk_upload_edit');
 }
 
 /**