diff --git a/plugins/content_types/entity_context/entity_field_extra.inc b/plugins/content_types/entity_context/entity_field_extra.inc
index 807969c..c678ec5 100644
--- a/plugins/content_types/entity_context/entity_field_extra.inc
+++ b/plugins/content_types/entity_context/entity_field_extra.inc
@@ -67,8 +67,17 @@ function ctools_entity_field_extra_content_type_edit_form($form, &$form_state) {
 
   $info = entity_get_info($entity_type);
   $view_mode_options = array();
-  foreach ($info['view modes'] as $mode => $option) {
-    $view_mode_options[$mode] = $option['label'];
+  // Special case for taxonomy term description which is not a field
+  if ($entity_type == "taxonomy_term" && $field_name == "description") {
+    $info = filter_formats();
+    foreach ($info as $mode => $option) {
+      $view_mode_options[$mode] = $option->name;
+    }
+  }
+  else {
+    foreach ($info['view modes'] as $mode => $option) {
+      $view_mode_options[$mode] = $option['label'];
+    }
   }
 
   $form['view_mode'] = array(
@@ -102,8 +111,14 @@ function ctools_entity_field_extra_content_type_render($subtype, $conf, $panel_a
   $entity->content = array();
   $langcode = $GLOBALS['language_content']->language;
 
-  module_invoke_all($entity_type . '_view', $entity, $conf['view_mode'], $langcode);
-  module_invoke_all('entity_view', $entity, $entity_type, $conf['view_mode'], $langcode);
+  // Special case for taxonomy term description which is not a field
+  if ($entity_type == "taxonomy_term" && $field_name == "description") {
+    $entity->content[$field_name] = check_markup($context->data->description, $conf['view_mode'], $langcode);
+  }
+  else {
+    module_invoke_all($entity_type . '_view', $entity, $conf['view_mode'], $langcode);
+    module_invoke_all('entity_view', $entity, $entity_type, $conf['view_mode'], $langcode);
+  }
 
   if (isset($entity->content[$field_name])) {
     // Build the content type block.
diff --git a/plugins/content_types/term_context/term_description.inc b/plugins/content_types/term_context/term_description.inc
index 35988e6..26d36c0 100644
--- a/plugins/content_types/term_context/term_description.inc
+++ b/plugins/content_types/term_context/term_description.inc
@@ -20,7 +20,7 @@ function ctools_term_description_content_type_render($subtype, $conf, $panel_arg
 
   $block->title = $term->name;
   if ($term) {
-    $block->content = _filter_autop(filter_xss_admin($term->description));
+    $block->content = check_markup($term->description, $term->format);
     $block->delta = $term->tid;
 
     if (user_access('administer taxonomy')) {