diff --git a/file_shadowbox/file_shadowbox.module b/file_shadowbox/file_shadowbox.module
index cf907ca..7bfc049 100644
--- a/file_shadowbox/file_shadowbox.module
+++ b/file_shadowbox/file_shadowbox.module
@@ -210,12 +210,12 @@ function file_shadowbox_field_formatter_view($entity_type, $entity, $field, $ins
     case 'nid':
       $info = entity_get_info($entity_type);
       $id = $info['entity keys']['id'];
-      $gallery_id = "{$entity_type}{$entity->$id}";
+      $gallery_id = "{$entity_type}-{$entity->$id}";
       break;
     case 'field_nid':
       $info = entity_get_info($entity_type);
       $id = $info['entity keys']['id'];
-      $gallery_id = "{$entity_type}{$entity->$id}-{$field['field_name']}";
+      $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 e1a576a..5aaf2bb 100644
--- a/image_shadowbox/image_shadowbox.module
+++ b/image_shadowbox/image_shadowbox.module
@@ -161,12 +161,12 @@ function image_shadowbox_field_formatter_view($entity_type, $entity, $field, $in
     case 'nid':
       $info = entity_get_info($entity_type);
       $id = $info['entity keys']['id'];
-      $gallery_id = "{$entity_type}{$entity->$id}";
+      $gallery_id = "{$entity_type}-{$entity->$id}";
       break;
     case 'field_nid':
       $info = entity_get_info($entity_type);
       $id = $info['entity keys']['id'];
-      $gallery_id = "{$entity_type}{$entity->$id}-{$field['field_name']}";
+      $gallery_id = "{$entity_type}-{$entity->$id}-{$field['field_name']}";
       break;
     default:
       $gallery_id = "";