diff --git a/context.core.inc b/context.core.inc
index 5a85e8a..b92c246 100644
--- a/context.core.inc
+++ b/context.core.inc
@@ -79,10 +79,11 @@ function context_theme_registry_alter(&$theme_registry) {
 
 /**
  * Implementation of hook_ctools_render_alter().
- * Used to detect the presence of a page manager node view or node form.
+ * Used to detect the presence of a page manager node or taxonomy view or form.
  */
 function context_ctools_render_alter($info, $page, $data) {
   extract($data);
+  // Check for node page handler
   if ($page && in_array($task['name'], array('node_view', 'node_edit'), TRUE)) {
     foreach ($contexts as $ctools_context) {
       if (in_array('node', $ctools_context->type) && !empty($ctools_context->data)) {
@@ -91,6 +92,16 @@ function context_ctools_render_alter($info, $page, $data) {
       }
     }
   }
+  // Check for taxonomy term page handler
+  if ($page && in_array($task['name'], array('term_view', 'term_edit'), TRUE)) {
+    foreach ($contexts as $ctools_context) {
+      if (in_array('taxonomy_term', $ctools_context->type) && !empty($ctools_context->data)) {
+        $plugin = context_get_plugin('condition', 'taxonomy_term');
+        $plugin->execute($ctools_context->data, $task['name'] === 'term_view' ? 'view' : 'form');
+        break;
+      }
+    }
+  }
 }
 
 /**