diff --git a/fieldable-panels-pane.tpl.php b/fieldable-panels-pane.tpl.php
index 4cc8877..6b992b2 100644
--- a/fieldable-panels-pane.tpl.php
+++ b/fieldable-panels-pane.tpl.php
@@ -1,3 +1,4 @@
 <div class="<?php print $classes; ?>"<?php print $attributes; ?>>
+  <?php print render($title_suffix); ?>
   <?php print $fields; ?>
 </div>
diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index caa19a9..a172da4 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -146,6 +146,7 @@ function fieldable_panels_panes_menu() {
   $items['admin/structure/fieldable-panels-panes/view/%fieldable_panels_panes/edit'] = array(
     'title' => 'Edit',
     'type' => MENU_LOCAL_TASK,
+    'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
     'page callback' => 'fieldable_panels_panes_entity_edit_page',
     'page arguments' => array(4),
     'access callback' => 'fieldable_panels_panes_access',
@@ -176,6 +177,7 @@ function fieldable_panels_panes_menu() {
   $items['admin/structure/fieldable-panels-panes/view/%fieldable_panels_panes/delete'] = array(
     'title' => 'Delete',
     'type' => MENU_LOCAL_TASK,
+    'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE,
     'page callback' => 'drupal_get_form',
     'page arguments' => array('fieldable_panels_panes_entity_delete_form', 4),
     'access callback' => 'fieldable_panels_panes_access',
diff --git a/includes/PanelsPaneController.class.php b/includes/PanelsPaneController.class.php
index c00975e..4710c9a 100644
--- a/includes/PanelsPaneController.class.php
+++ b/includes/PanelsPaneController.class.php
@@ -173,8 +173,8 @@ class PanelsPaneController extends DrupalDefaultEntityController {
     // attach our fields and prepare the pane for rendering
     field_attach_prepare_view('fieldable_panels_pane', array($entity->fpid => $entity), $view_mode, $langcode);
     entity_prepare_view('fieldable_panels_pane', array($entity->fpid => $entity), $langcode);
-    $entity->content = field_attach_view('fieldable_panels_pane', $entity, $view_mode, $langcode);
-    $entity->content += array(
+    $build = field_attach_view('fieldable_panels_pane', $entity, $view_mode, $langcode);
+    $build += array(
       '#fieldable_panels_pane' => $entity,
       '#theme' => 'fieldable_panels_pane',
       '#element' => $entity,
@@ -182,10 +182,15 @@ class PanelsPaneController extends DrupalDefaultEntityController {
       '#language' => $langcode,
     );
 
+    // Add contextual links.
+    if (!empty($entity->fpid)) {
+      $build['#contextual_links']['fieldable_panels_panes'] = array('admin/structure/fieldable-panels-panes/view', array($entity->fpid));
+    }
+
     $entity_type = 'fieldable_panels_pane';
-    drupal_alter(array('fieldable_panels_pane_view', 'entity_view'), $entity->content, $entity_type);
+    drupal_alter(array('fieldable_panels_pane_view', 'entity_view'), $build, $entity_type);
 
-    return $entity->content;
+    return $build;
   }
 
   public function delete($fpids) {
diff --git a/plugins/content_types/fieldable_panels_pane.inc b/plugins/content_types/fieldable_panels_pane.inc
index daf9961..e144bbb 100644
--- a/plugins/content_types/fieldable_panels_pane.inc
+++ b/plugins/content_types/fieldable_panels_pane.inc
@@ -79,16 +79,6 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_render($subty
       $block->title = !empty($entity->title) ? filter_xss_admin($entity->title) : '';
     }
     $block->content = fieldable_panels_panes_view($entity, $view_mode);
-
-    if (fieldable_panels_panes_access('update', $entity)) {
-      $block->admin_links[] = array(
-        'title' => t('Edit pane'),
-        'alt' => t("Edit the values in this pane"),
-        'href' => "admin/structure/fieldable-panels-panes/view/$entity->fpid/edit",
-        'query' => drupal_get_destination(),
-      );
-    }
-
     return $block;
   }
 }