diff --git a/admin/css/screen.css b/admin/css/screen.css
index d3d170f3a..e839c7ac7 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -659,6 +659,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
 
 .htmleditorfield-mediaform .ss-gridfield tbody td:first-child img { max-height: 30px; }
 .htmleditorfield-mediaform .ss-uploadfield.from-web, .htmleditorfield-mediaform .ss-uploadfield.from-CMS { margin-bottom: 48px; }
+.htmleditorfield-mediaform .ss-gridfield .gridfield-button-delete { display: none; }
 .htmleditorfield-mediaform .ss-uploadfield.from-web .middleColumn, .htmleditorfield-mediaform .ss-uploadfield.from-CMS .middleColumn { width: auto; background: none; border: none; margin-top: 13px; }
 .htmleditorfield-mediaform .ss-uploadfield.from-CMS { margin-top: 33px; }
 .htmleditorfield-mediaform .ss-uploadfield.from-CMS h4 { margin-top: 3px; }
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index ab540d2ac..735ac393f 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -1476,6 +1476,10 @@ body.cms-dialog {
 		// Set thumbnail size 
 		tbody td:first-child img {
 			max-height: 30px;
+		.gridfield-button-delete {
+			// TODO Remove from PHP instead of hiding
+			display: none; // delete action shouldn't be allowed here
+		}
 		}
 	}
 
diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php
index d69d7381b..799d442a0 100644
--- a/forms/HtmlEditorField.php
+++ b/forms/HtmlEditorField.php
@@ -380,6 +380,8 @@ class HtmlEditorField_Toolbar extends RequestHandler {
 			new GridFieldSortableHeader(),
 			new GridFieldDataColumns(),
 			new GridFieldPaginator(5),
+			// TODO Shouldn't allow delete here, its too confusing with a "remove from editor view" action.
+			// Remove once we can fit the search button in the last actual title column
 			new GridFieldDeleteAction(),
 			new GridFieldDetailForm()
 		);