Index: plugins/contexts/node_add_form.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/ctools/plugins/contexts/node_add_form.inc,v
retrieving revision 1.9.2.2
diff -u -r1.9.2.2 node_add_form.inc
--- plugins/contexts/node_add_form.inc	29 Jan 2010 20:18:26 -0000	1.9.2.2
+++ plugins/contexts/node_add_form.inc	14 Jun 2010 14:45:04 -0000
@@ -31,12 +31,14 @@
  * are not always created from the UI.
  */
 function ctools_context_create_node_add_form($empty, $data = NULL, $conf = FALSE) {
+  static $created;
   $context = new ctools_context(array('form', 'node_add', 'node_form'));
   $context->plugin = 'node_add_form';
 
-  if ($empty) {
+  if ($empty || (isset($created) && $created)) {
     return $context;
   }
+  $created = TRUE;
 
   if ($conf && (isset($data['types']) || isset($data['type']))) {
     // Holdover from typo'd config.
Index: plugins/contexts/node_edit_form.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/ctools/plugins/contexts/node_edit_form.inc,v
retrieving revision 1.10.2.6
diff -u -r1.10.2.6 node_edit_form.inc
--- plugins/contexts/node_edit_form.inc	26 May 2010 17:23:16 -0000	1.10.2.6
+++ plugins/contexts/node_edit_form.inc	14 Jun 2010 14:45:04 -0000
@@ -35,12 +35,14 @@
  * are not always created from the UI.
  */
 function ctools_context_create_node_edit_form($empty, $node = NULL, $conf = FALSE) {
+  static $created;
   $context = new ctools_context(array('form', 'node_edit', 'node_form', 'node', 'node_edit_form'));
   $context->plugin = 'node_edit_form';
 
-  if ($empty) {
+  if ($empty || (isset($created) && $created)) {
     return $context;
   }
+  $created = TRUE;
 
   if ($conf) {
     // In this case, $node is actually our $conf array.