diff -up admin_links-6.x-1.5/admin_links.admin.inc admin_links/admin_links.admin.inc
--- admin_links-6.x-1.5/admin_links.admin.inc	2008-11-03 14:16:16.000000000 +1100
+++ admin_links/admin_links.admin.inc	2008-11-26 14:42:07.000000000 +1100
@@ -12,15 +12,25 @@
  * @see system_settings_form()
  */
 function admin_links_settings_form() {
-  $form['admin_links_edit'] = array(
+  $form['admin_links_teaser_edit'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add edit link to node teasers.'),
-    '#default_value' => admin_links_var('admin_links_edit'),
+    '#default_value' => admin_links_var('admin_links_teaser_edit'),
   );
-  $form['admin_links_delete'] = array(
+  $form['admin_links_teaser_delete'] = array(
     '#type' => 'checkbox',
     '#title' => t('Add delete link to node teasers.'),
-    '#default_value' => admin_links_var('admin_links_delete'),
+    '#default_value' => admin_links_var('admin_links_teaser_delete'),
+  );
+  $form['admin_links_full_edit'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add edit link to full nodes.'),
+    '#default_value' => admin_links_var('admin_links_full_edit'),
+  );
+  $form['admin_links_full_delete'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Add delete link to full nodes.'),
+    '#default_value' => admin_links_var('admin_links_full_delete'),
   );
   $form['admin_links_universaledit'] = array(
     '#type' => 'checkbox',
diff -up admin_links-6.x-1.5/admin_links.module admin_links/admin_links.module
--- admin_links-6.x-1.5/admin_links.module	2008-11-03 14:16:16.000000000 +1100
+++ admin_links/admin_links.module	2008-11-26 15:00:21.000000000 +1100
@@ -44,14 +44,28 @@ function admin_links_link($type, $node =
   if ($type == 'node') {
     $edit_access = node_access('update', $node);
     $delete_access = node_access('delete', $node);
-    if ($teaser && admin_links_var('admin_links_edit') && $edit_access) {
+    if ($teaser && admin_links_var('admin_links_teaser_edit') && $edit_access) {
       $links['admin_edit'] = array(
         'title' => t('Edit'),
         'href' => "node/{$node->nid}/edit",
         'query' => drupal_get_destination(),
       );
     }
-    if ($teaser && admin_links_var('admin_links_delete') && $delete_access) {
+    if ($teaser && admin_links_var('admin_links_teaser_delete') && $delete_access) {
+      $links['admin_delete'] = array(
+        'title' => t('Delete'),
+        'href' => "node/{$node->nid}/delete",
+        'query' => drupal_get_destination(),
+      );
+    }
+    if (!$teaser && admin_links_var('admin_links_full_edit') && $edit_access && (arg(0) != 'node')) {
+      $links['admin_edit'] = array(
+        'title' => t('Edit'),
+        'href' => "node/{$node->nid}/edit",
+        'query' => drupal_get_destination(),
+      );
+    }
+    if (!$teaser && admin_links_var('admin_links_full_delete') && $delete_access && (arg(0) != 'node')) {
       $links['admin_delete'] = array(
         'title' => t('Delete'),
         'href' => "node/{$node->nid}/delete",
@@ -76,8 +90,10 @@ function admin_links_link($type, $node =
  */
 function admin_links_variables() {
   return array(
-    'admin_links_edit' => 1,
-    'admin_links_delete' => 0,
+    'admin_links_teaser_edit' => 1,
+    'admin_links_teaser_delete' => 0,
+    'admin_links_full_edit' => 0,
+    'admin_links_full_delete' => 0,
     'admin_links_universaledit' => 0,
   );
 }