Index: taxonomy_menu.module
===================================================================
--- taxonomy_menu.module	(revision 2480)
+++ taxonomy_menu.module	(working copy)
@@ -35,6 +35,7 @@
   variable_set('taxonomy_menu_display_num',         $form['taxonomy_menu_display_num']);
   variable_set('taxonomy_menu_hide_empty',          $form['taxonomy_menu_hide_empty']);
   variable_set('taxonomy_menu_display_descendants', $form['taxonomy_menu_display_descendants']);
+  variable_set('taxonomy_menu_display_context',     $form['taxonomy_menu_display_context']);
 
   // Save which category should be displayed on menu
   foreach (taxonomy_get_vocabularies() as $vocab) {
@@ -85,6 +86,8 @@
  */
 function taxonomy_menu_nodeapi(&$node, $op, $a3, $a4) {
   static $vocabs = array();
+  // skip checking for vocabs if display node context is disabled
+  if (!variable_get('taxonomy_menu_display_context', TRUE)) $vocabs = NULL;
 
   // First check if the node has a relevant category.s
   if (empty($vocabs) and is_array($vocabs)) {
Index: taxonomy_menu.inc
===================================================================
--- taxonomy_menu.inc	(revision 2480)
+++ taxonomy_menu.inc	(working copy)
@@ -91,6 +91,12 @@
     '#title'          => t('Display descendants'),
     '#type'           => 'checkbox',
   );
+  $form['taxonomy_menu_display_context'] = array(
+    '#default_value'  => variable_get('taxonomy_menu_display_context', TRUE),
+    '#description'    => t('Display an active menu item for the first matching taxonomy term of the current node.'),
+    '#title'          => t('Display in context.'),
+    '#type'           => 'checkbox',
+  );
 
   $form['submit'] = array(
     '#value'          => t('Submit'),
