diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php
index 49b70d50..975ad164 100644
--- a/code/ModelAdmin.php
+++ b/code/ModelAdmin.php
@@ -612,7 +612,6 @@ class ModelAdmin_RecordController extends Controller {
 		$validator = ($this->currentRecord->hasMethod('getCMSValidator')) ? $this->currentRecord->getCMSValidator() : null;
 		
 		$actions = new FieldSet(
-			//new FormAction("goBack", "Back"),
 			new FormAction("doSave", "Save")
 		);
 		
@@ -620,6 +619,8 @@ class ModelAdmin_RecordController extends Controller {
 			$actions->insertFirst($deleteAction = new FormAction('doDelete', 'Delete'));
 			$deleteAction->addExtraClass('delete');
 		}
+
+		$actions->insertFirst(new FormAction("goBack", "Back"));
 		
 		$form = new Form($this, "EditForm", $fields, $actions, $validator);
 		$form->loadDataFrom($this->currentRecord);
diff --git a/javascript/LeftAndMain.js b/javascript/LeftAndMain.js
index 1eeeaffd..e7c0fd2f 100644
--- a/javascript/LeftAndMain.js
+++ b/javascript/LeftAndMain.js
@@ -252,11 +252,11 @@ function ajaxActionsAtTop(formName, actionHolderName, tabName) {
 	var actions = document.getElementsBySelector('#' + formName + ' .Actions')[0];
 	var holder;
 
-	if(actions) {
-		if((holder = $(actionHolderName)) && holder != actions) {
-			holder.parentNode.removeChild(holder);
-		}
+	if((holder = $(actionHolderName)) && holder != actions) {
+		holder.parentNode.removeChild(holder);
+	}
 
+	if(actions) {
 		actions.id = actionHolderName;
 		actions.className = 'ajaxActions';
 
diff --git a/javascript/ModelAdmin.js b/javascript/ModelAdmin.js
index afc658f2..740e24df 100644
--- a/javascript/ModelAdmin.js
+++ b/javascript/ModelAdmin.js
@@ -142,7 +142,7 @@ jQuery(document).ready(function() {
 		data = formData(form);
 		jQuery.get(form.attr('action'), data, function(result){
 			jQuery('#right #ModelAdminPanel').html(result);
-			
+			jQuery('#form_actions_right').remove();
 			Behaviour.apply();
 		});