--- context.core.inc	2009-12-20 00:37:28.000000000 -0500
+++ context.core.inc.modified	2009-12-20 00:36:59.000000000 -0500
@@ -265,7 +265,15 @@ function context_context_reactions() {
  * Implementation of hook_nodeapi().
  */
 function context_nodeapi(&$node, $op, $teaser, $page) {
-  if ($op == 'view' && $page && menu_get_object() === $node) {
+
+  $is_current_node = FALSE;
+  if (arg(0) == 'node' && is_numeric(arg(1)) && arg(2) == NULL ) {
+    if (arg(1) == $node->nid) {
+      $is_current_node = TRUE;
+    }
+  }
+  
+  if ($is_current_node) {
     // Implementation of context_set_by_condition for node.
     context_set_by_condition('node', $node->type);
 
