Index: plugins/contexts/node.inc
===================================================================
--- plugins/contexts/node.inc	(revision 1041)
+++ plugins/contexts/node.inc	(revision 1042)
@@ -157,6 +157,17 @@
   unset($form_values['set_identifier']);
 }
 
+function ctools_flatten_token_list($token_list) {
+  $f = array();
+  foreach ($token_list as $k => $v) {
+    if (is_array($v))
+      $f = array_merge($f, ctools_flatten_token_list($v));
+    else
+      $f[$k] = "$v ($k)";
+  }
+  return $f;
+}
+
 /**
  * Provide a list of ways that this context can be converted to a string.
  */
@@ -170,7 +181,7 @@
   );
 
   if (module_exists('token')) {
-    $list += reset(token_get_list(array('node')));
+    $list = array_merge($list, ctools_flatten_token_list(token_get_list(array('node'))));
   }
 
   return $list;