diff --git a/plugins/content_types/fieldable_panels_pane.inc b/plugins/content_types/fieldable_panels_pane.inc
index e144bbb..5d81925 100644
--- a/plugins/content_types/fieldable_panels_pane.inc
+++ b/plugins/content_types/fieldable_panels_pane.inc
@@ -188,7 +188,10 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_sub
 
   fieldable_panels_panes_entity_edit_form_submit($form, $form_state);
   if (!empty($entity->is_new)) {
-    if (module_exists('uuid') && isset($entity->uuid)) {
+    if (isset($entity->vid)) {
+      $entity_id = 'vid:' . $entity->vid;
+    }
+    elseif (module_exists('uuid') && isset($entity->uuid)) {
       $entity_id = 'uuid:' . $entity->uuid;
     }
     else {
@@ -200,6 +203,9 @@ function fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form_sub
     // use case. Not that anybody uses this outside of Panels.
     $form_state['pane']->subtype = $entity_id;
   }
+  else {
+    $form_state['pane']->subtype = 'vid:' . $entity->vid;
+  }
 }
 
 // --------------------------------------------------------------------------