diff --git a/src/templates/_macros/_node_edit_form.jade b/src/templates/_macros/_node_edit_form.jade
index eeae23af..2fdd7ff4 100644
--- a/src/templates/_macros/_node_edit_form.jade
+++ b/src/templates/_macros/_node_edit_form.jade
@@ -1,4 +1,4 @@
-| {% macro render_field(field) %}
+| {% macro render_field(field, type) %}
 
 .form-group(class="{{field.name}}{% if field.errors %} error{% endif %}")
 
@@ -9,7 +9,7 @@
 			| {{ field.label }}
 	| {% elif field.type == 'FieldList' %}
 
-	ul.fieldlist#files
+	ul.fieldlist(id="{{ type }}")
 		| {% for file in field %}
 		li.fieldlist-item
 
diff --git a/src/templates/nodes/edit_embed.jade b/src/templates/nodes/edit_embed.jade
index 4f01d6c2..5080e318 100644
--- a/src/templates/nodes/edit_embed.jade
+++ b/src/templates/nodes/edit_embed.jade
@@ -45,7 +45,7 @@
 				i.pi-plus
 				| Add New Attachment
 
-		| {{ render_field(field) }}
+		| {{ render_field(field, field.name) }}
 
 		| {% elif field.name == 'files' %}
 		.files-header
@@ -53,9 +53,10 @@
 				#files-action-add
 					i.pi-plus
 					| Add New File
-		| {{ render_field(field) }}
+		| {{ render_field(field, field.name) }}
 
 		| {% else %}
+
 		| {{ render_field(field) }}
 
 		| {% endif %}