diff --git a/modules/fields/mee/mee.module b/modules/fields/mee/mee.module
index d48ed24..4e11269 100644
--- a/modules/fields/mee/mee.module
+++ b/modules/fields/mee/mee.module
@@ -177,7 +177,7 @@ function mee_form_alter(&$form, &$form_state, $form_id) {
 
   $settings = $form['#instance']['settings'];
 
-  $context_options = array();
+  $context_options = array('' => t('- Use global default context -'));
   foreach (scald_contexts_public() as $name => $context) {
     $context_options[$name] = $context['title'];
   }
@@ -198,7 +198,7 @@ function mee_form_alter(&$form, &$form_state, $form_id) {
     '#type' => 'select',
     '#title' => t('Scald default context'),
     '#description' => t('You can customize field level default context for drag and drop atoms.'),
-    '#default_value' => isset($settings['context_default']) ? $settings['context_default'] : variable_get('dnd_context_default', 'sdl_editor_representation'),
+    '#default_value' => isset($settings['context_default']) ? $settings['context_default'] : '',
     '#options' => $context_options,
   );
   $form['instance']['settings']['context'] = array(
@@ -407,7 +407,7 @@ function mee_field_widget_form_alter(&$element, &$form_state, $context) {
   // Activate DnD Library for this element if enabled.
   if (!empty($enables['dnd'])) {
     $settings = $context['instance']['settings'];
-    $context_default = isset($settings['context_default']) ?
+    $context_default = !empty($settings['context_default']) ?
        $settings['context_default'] :
        variable_get('dnd_context_default', 'sdl_editor_representation');
     $element['#attributes']['data-dnd-context'][] = $context_default;
diff --git a/modules/library/dnd/dnd.admin.inc b/modules/library/dnd/dnd.admin.inc
index 7a18554..8ab4dec 100644
--- a/modules/library/dnd/dnd.admin.inc
+++ b/modules/library/dnd/dnd.admin.inc
@@ -9,6 +9,11 @@
  */
 function dnd_admin_form() {
   $libraries = dnd_get_libraries();
+  $context_options = array();
+  foreach (scald_contexts_public() as $slug => $context) {
+    $context_options[$slug] = $context['title'];
+  }
+
   $form['dnd_callback_url'] = array(
     '#type' => 'select',
     '#title' => t('Library'),
@@ -32,6 +37,13 @@ function dnd_admin_form() {
     '#default_value' => variable_get('dnd_modal_height', 300),
     '#description' => t('The height of the modal window opened from the library in pixels or percentage. Example: 100 for 100 pixels, 0.5 for 50%.'),
   );
+  $form['dnd_context_default'] = array(
+    '#type' => 'select',
+    '#title' => t('Default context'),
+    '#options' => $context_options,
+    '#default_value' => variable_get('dnd_context_default', 'sdl_editor_representation'),
+    '#description' => t('The context selected here will be used as a default when an atom needs to be rendered to an end user and no context was explicitly specified'),
+  );
   if (function_exists('qtip_fetch_instances_field')) {
     $form['dnd_qtip_instance'] = qtip_fetch_instances_field(variable_get('dnd_qtip_instance', ''));
   }