--- plugins/content_types/node/node.inc	2010-07-26 18:34:20.000000000 +0100
+++ plugins/content_types/node/node.inc	2011-10-06 18:48:01.000000000 +0100
@@ -78,11 +78,11 @@ function ctools_node_content_type_render
   $block->module = 'node';
   $block->delta = $node->nid;
 
+  // Set block->title to the plain node title, then additionally set block->title_link to
+  // the node url if required. The actual link is rendered in ctools_content_render().
+  $block->title = check_plain($node->title);
   if (!empty($conf['link_node_title'])) {
-    $block->title = l($node->title, 'node/' . $node->nid);
-  }
-  else {
-    $block->title = check_plain($node->title);
+    $block->title_link = 'node/' . $node->nid;
   }
 
   if (empty($conf['leave_node_title'])) {