diff --git a/forms/UploadField.php b/forms/UploadField.php
index 82588ca33..40523ca26 100644
--- a/forms/UploadField.php
+++ b/forms/UploadField.php
@@ -867,7 +867,6 @@ class UploadField_ItemHandler extends RequestHandler {
 		// Check item permissions
 		$item = $this->getItem();
 		if(!$item) return $this->httpError(404);
-		if(!$item->canEdit()) return $this->httpError(403);
 
 		// Only allow actions on files in the managed relation (if one exists)
 		$items = $this->parent->getItems();
diff --git a/templates/Includes/UploadField_FileButtons.ss b/templates/Includes/UploadField_FileButtons.ss
index 1f0f6242c..6fbb0e185 100644
--- a/templates/Includes/UploadField_FileButtons.ss
+++ b/templates/Includes/UploadField_FileButtons.ss
@@ -4,13 +4,12 @@
 	<span class="toggle-details">
 		<span class="toggle-details-icon"></span>
 	</span>
-
 	</button>
-	<% if UploadFieldHasRelation %>
+<% end_if %>
+<% if UploadFieldHasRelation %>
 	<button data-href="$UploadFieldRemoveLink" class="ss-uploadfield-item-remove ss-ui-button ui-corner-all" title="<% _t('UploadField.REMOVEINFO', 'Remove this file from here, but do not delete it from the file store') %>" data-icon="plug-disconnect-prohibition">
 	<% _t('UploadField.REMOVE', 'Remove') %></button>
 <% end_if %>
-<% end_if %>
 <% if canDelete %>
 	<button data-href="$UploadFieldDeleteLink" class="ss-uploadfield-item-delete ss-ui-button ui-corner-all" title="<% _t('UploadField.DELETEINFO', 'Permanently delete this file from the file store') %>" data-icon="minus-circle"><% _t('UploadField.DELETE', 'Delete from files') %></button>
 <% end_if %>