diff --git a/admin/javascript/LeftAndMain.EditForm.js b/admin/javascript/LeftAndMain.EditForm.js
index 4bd9452f4..3e17b2683 100644
--- a/admin/javascript/LeftAndMain.EditForm.js
+++ b/admin/javascript/LeftAndMain.EditForm.js
@@ -172,7 +172,7 @@
 		 * We need this onclick overloading because we can't get to the
 		 * clicked button from a form.onsubmit event.
 		 */
-		$('.cms-edit-form .Actions input, .cms-edit-form .Actions button').entwine({
+		$('.cms-edit-form .Actions :button').entwine({
 			
 			/**
 			 * Function: onclick
diff --git a/admin/javascript/ModelAdmin.js b/admin/javascript/ModelAdmin.js
index 08eeecf1f..0ecfe4076 100644
--- a/admin/javascript/ModelAdmin.js
+++ b/admin/javascript/ModelAdmin.js
@@ -175,7 +175,7 @@
 		 * 
 		 * RHS panel Delete button
 		 */
-		$('.cms-edit-form input[name=action_doDelete]').entwine({
+		$('.cms-edit-form :submit[name=action_doDelete]').entwine({
 			// Function: onclick
 			onclick: function(e) {
 				if(!confirm(ss.i18n._t('ModelAdmin.REALLYDELETE', 'Really delete?'))) {
diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js
index 1fec43a11..f44cf55dc 100644
--- a/javascript/HtmlEditorField.js
+++ b/javascript/HtmlEditorField.js
@@ -577,7 +577,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 			}
 		});
 
-		$('form.htmleditorfield-linkform input[name=action_remove]').entwine({
+		$('form.htmleditorfield-linkform :submit[name=action_remove]').entwine({
 			onclick: function(e) {
 				this.parents('form:first').removeLink();
 				return false;