diff --git a/fieldable_panels_panes.module b/fieldable_panels_panes.module
index d3e0b0d..e8841e4 100644
--- a/fieldable_panels_panes.module
+++ b/fieldable_panels_panes.module
@@ -991,7 +991,7 @@ function fieldable_panels_panes_load_from_subtype($subtype_name) {
   $subtype_info = ctools_content_get_subtype($plugin, $subtype_name);
 
   // This means we're probably in the process of creating a new one.
-  if (isset($subtype_info['bundle'])) {
+  if (!isset($subtype_info['entity_id'])) {
     return fieldable_panels_panes_create(array('bundle' => $subtype_info['bundle']));
   }
 
diff --git a/plugins/content_types/fieldable_panels_pane.inc b/plugins/content_types/fieldable_panels_pane.inc
index ee10fd6..1f1e182 100644
--- a/plugins/content_types/fieldable_panels_pane.inc
+++ b/plugins/content_types/fieldable_panels_pane.inc
@@ -436,6 +436,7 @@ function _fieldable_panels_panes_custom_content_type($entity) {
   }
 
   $info['entity_id'] = $info['name'];
+  $info['bundle'] = $entity->bundle;
   return $info;
 }