diff --git a/includes/media.admin.inc b/includes/media.admin.inc
index 9871b73..99ffbcb 100644
--- a/includes/media.admin.inc
+++ b/includes/media.admin.inc
@@ -299,18 +299,30 @@ function media_admin_config_browser($form, &$form_state) {
 
   // If the WYSIWYG module is enabled, add additional configs.
   if (module_exists('wysiwyg')) {
+    $form['wysiwyg'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('WYSIWYG Options'),
+      '#collapsible' => false,
+    );
     $plugins = media_get_browser_plugin_info();
-    $form[media_variable_name('wysiwyg_browser_plugins')] = array(
+    $form['wysiwyg'][media_variable_name('wysiwyg_browser_plugins')] = array(
       '#type' => 'checkboxes',
-      '#title' => t('Enabled browser plugins in WYSIWYG'),
+      '#title' => t('Enabled browser plugins'),
       '#options' => array(),
       '#required' => FALSE,
       '#default_value' => media_variable_get('wysiwyg_browser_plugins'),
       '#description' => t('If no plugins are selected, they will all be available.'),
     );
     foreach ($plugins as $key => $plugin) {
-      $form[media_variable_name('wysiwyg_browser_plugins')]['#options'][$key] = !empty($plugin['title']) ? $plugin['title'] : $key;
+      $form['wysiwyg'][media_variable_name('wysiwyg_browser_plugins')]['#options'][$key] = !empty($plugin['title']) ? $plugin['title'] : $key;
     }
+    $form['wysiwyg'][media_variable_name('wysiwyg_upload_directory')] = array(
+      '#type' => 'textfield',
+      '#title' => t("File directory for uploaded media"),
+      '#default_value' => media_variable_get('wysiwyg_upload_directory'),
+      '#description' => t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes.'),
+    );
+
   }
 
   $form['#submit'][] = 'media_admin_config_browser_pre_submit';
diff --git a/wysiwyg_plugins/media.inc b/wysiwyg_plugins/media.inc
index e0e2c0d..5fee29b 100644
--- a/wysiwyg_plugins/media.inc
+++ b/wysiwyg_plugins/media.inc
@@ -30,6 +30,7 @@ function media_media_plugin() {
     'settings' => array(
       'global' => array(
         'enabledPlugins' => media_variable_get('wysiwyg_browser_plugins'),
+        'file_directory' => media_variable_get('wysiwyg_upload_directory'),
         'types' => media_variable_get('wysiwyg_allowed_types'),
         'id' => 'media_wysiwyg',
       ),