diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index d7a57b1..96e3105 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -25,11 +25,11 @@ function fieldable_panels_panes_entity_info() {
         'id' => 'fpid',
         'revision' => 'vid',
         'bundle' => 'bundle',
-        'label' => 'admin_title',
         'language' => 'language',
         'uuid' => 'uuid',
         'revision uuid' => 'vuuid',
       ),
+      'label callback' => 'fieldable_panels_panes_entity_label_callback',
       'bundles' => array(
         // @todo We need to store the possible bundles and create a UI.
         // to allow for more bundles. For now, hook_panels_panes_entity_info_alter
@@ -940,3 +940,18 @@ function fieldable_panels_panes_entity_edit_form_submit($form, &$form_state) {
     drupal_set_message(t('The entity has been saved.'));
   }
 }
+
+/**
+ * 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;
+  }
+}