diff --git a/file_shadowbox/file_shadowbox.module b/file_shadowbox/file_shadowbox.module
index 7f48ec0..c1566df 100644
--- a/file_shadowbox/file_shadowbox.module
+++ b/file_shadowbox/file_shadowbox.module
@@ -166,8 +166,8 @@ function file_shadowbox_field_formatter_settings_summary($field, $instance, $vie
   $gallery_options = array(
     'page'      => 'gallery page',
     'field'     => 'gallery field page',
-    'nid'       => 'gallery node',
-    'field_nid' => 'gallery field node',
+    'nid'       => 'gallery entity',
+    'field_nid' => 'gallery field entity',
   );
 
   if (isset($gallery_options[$settings['gallery']])) {
@@ -208,10 +208,14 @@ function file_shadowbox_field_formatter_view($entity_type, $entity, $field, $ins
       $gallery_id = $field['field_name'];
       break;
     case 'nid':
-      $gallery_id = "nid-{$entity->nid}";
+      $info = entity_get_info($entity_type);
+      $id = $info['entity keys']['id'];
+      $gallery_id = "{$entity_type}{$entity->$id}";
       break;
     case 'field_nid':
-      $gallery_id = "nid-{$entity->nid}-{$field['field_name']}";
+      $info = entity_get_info($entity_type);
+      $id = $info['entity keys']['id'];
+      $gallery_id = "{$entity_type}{$entity->$id}-{$field['field_name']}";
       break;
     default:
       $gallery_id = "";
diff --git a/image_shadowbox/image_shadowbox.module b/image_shadowbox/image_shadowbox.module
index ed13827..4d6863e 100644
--- a/image_shadowbox/image_shadowbox.module
+++ b/image_shadowbox/image_shadowbox.module
@@ -121,8 +121,8 @@ function image_shadowbox_field_formatter_settings_summary($field, $instance, $vi
   $gallery_options = array(
     'page'      => 'gallery page',
     'field'     => 'gallery field page',
-    'nid'       => 'gallery node',
-    'field_nid' => 'gallery field node',
+    'nid'       => 'gallery entity',
+    'field_nid' => 'gallery field entity',
   );
 
   if (isset($gallery_options[$settings['gallery']])) {
@@ -159,10 +159,14 @@ function image_shadowbox_field_formatter_view($entity_type, $entity, $field, $in
       $gallery_id = $field['field_name'];
       break;
     case 'nid':
-      $gallery_id = "nid-{$entity->nid}";
+      $info = entity_get_info($entity_type);
+      $id = $info['entity keys']['id'];
+      $gallery_id = "{$entity_type}{$entity->$id}";
       break;
     case 'field_nid':
-      $gallery_id = "nid-{$entity->nid}-{$field['field_name']}";
+      $info = entity_get_info($entity_type);
+      $id = $info['entity keys']['id'];
+      $gallery_id = "{$entity_type}{$entity->$id}-{$field['field_name']}";
       break;
     default:
       $gallery_id = "";