diff --git a/addtoany/views/addtoany.views.inc b/addtoany/views/addtoany.views.inc
index c2c3a05..aceffa6 100644
--- a/addtoany/views/addtoany.views.inc
+++ b/addtoany/views/addtoany.views.inc
@@ -13,7 +13,7 @@ function addtoany_views_data() {
   $data['node']['addtoany_link'] = array(
     'title' => t('AddToAny link'),
     'help' => t('Link provided by the AddToAny module'),
-    'group' => t('Node'),
+    'group' => t('Content'),
     'field' => array(
       'handler' => 'addtoany_handler_field_addtoany_link',
       'click sortable' => FALSE,
diff --git a/addtoany/views/addtoany_handler_field_addtoany_link.inc b/addtoany/views/addtoany_handler_field_addtoany_link.inc
index a3f8789..62efb84 100644
--- a/addtoany/views/addtoany_handler_field_addtoany_link.inc
+++ b/addtoany/views/addtoany_handler_field_addtoany_link.inc
@@ -9,16 +9,9 @@
  * Field handler to present AddToAny links.
  */
 class addtoany_handler_field_addtoany_link extends views_handler_field_node_link {
-  function construct() {
-    parent::construct();
-    $this->additional_fields['title'] = 'title';
-  }
-
   function render($values) {
-    $node = new stdClass();
-    $node->nid = $values->{$this->aliases['nid']};
-    $node->title = $values->{$this->aliases['title']};
-
-    return _addtoany_create_button($node, $teaser);
+    if (($entity = $this->get_value($values)) && node_access('view', $entity)) {
+      return _addtoany_create_button($entity);
+    }
   }
 }