diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index 549fa48..bed9dc2 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -41,13 +41,13 @@ function fieldable_panels_panes_entity_info() {
       'id' => 'fpid',
       'revision' => 'vid',
       'bundle' => 'bundle',
-      'label' => 'admin_title',
       'language' => 'language',
       'uuid' => 'uuid',
       'revision uuid' => 'vuuid',
     ),
     'bundles' => $bundles,
     'bundle keys' => array('bundle' => 'name'),
+    'label callback' => 'fieldable_panels_panes_entity_label_callback',
     'view modes' => array(
       // @todo we should support view modes.
       'full' => array(
@@ -1101,3 +1101,18 @@ function fieldable_panels_pane_is_page($pane) {
   $page_page = menu_get_object('fieldable_panels_panes', 4);
   return (!empty($page_page) ? $page_page->fpid == $pane->fpid : FALSE);
 }
+
+/**
+ * Callback function for the FPP entity label.
+ */
+function fieldable_panels_panes_entity_label_callback($entity, $type) {
+  if (!empty($entity->admin_title)) {
+    return $entity->admin_title;
+  }
+  elseif (!empty($entity->title)) {
+    return $entity->title;
+  }
+  else {
+    return 'fpp__' . $entity->bundle . '_' . $entity->fpid;
+  }
+}