plugins/content_types/entity_context/entity_field.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/content_types/entity_context/entity_field.inc b/plugins/content_types/entity_context/entity_field.inc
index 2da4044..2a467e8 100644
--- a/plugins/content_types/entity_context/entity_field.inc
+++ b/plugins/content_types/entity_context/entity_field.inc
@@ -109,14 +109,15 @@ function ctools_entity_field_content_type_render($subtype, $conf, $panel_args, $
     $label = $conf['label'];
   }
 
-  $field_settings = array(
+  $field_settings = array_merge($conf, array(
     'label' => $label,
     'type' => $conf['formatter'],
-  );
+  ));
 
   // Get the field output, and the title.
   if (!empty($conf['formatter_settings'])) {
     $field_settings['settings'] = $conf['formatter_settings'];
+    unset($field_settings['formatter_settings']);
   }
 
   $all_values = field_get_items($entity_type, $entity, $field_name, $language);