Index: wp-includes/js/autosave.js
===================================================================
--- wp-includes/js/autosave.js	(revision 23367)
+++ wp-includes/js/autosave.js	(working copy)
@@ -5,13 +5,10 @@
 	autosaveLast = ( $('#post #title').val() || '' ) + ( $('#post #content').val() || '' );
 	autosavePeriodical = $.schedule({time: autosaveL10n.autosaveInterval * 1000, func: function() { autosave(); }, repeat: true, protect: true});
 
-	//Disable autosave after the form has been submitted
-	$("#post").submit(function() {
-		$.cancel(autosavePeriodical);
-		autosaveLockRelease = false;
-	});
+	var clickedSubmitButton;
 
-	$('input[type="submit"], a.submitdelete', '#submitpost').click(function(){
+	//Disable autosave once form has been submitted
+	$("#post").submit(function() {
 		blockSave = true;
 		window.onbeforeunload = null;
 		$(':button, :submit', '#submitpost').each(function(){
@@ -21,10 +18,18 @@
 			else
 				t.addClass('button-disabled');
 		});
-		if ( $(this).attr('id') == 'publish' )
+		if ( $(clickedSubmitButton).attr('id') == 'publish' )
 			$('#major-publishing-actions .spinner').show();
 		else
 			$('#minor-publishing .spinner').show();
+
+		$.cancel(autosavePeriodical);
+		autosaveLockRelease = false;
+		clickedSubmitButton = null;
+	});
+
+	$('input[type="submit"], a.submitdelete', '#submitpost').click(function(e){
+		clickedSubmitButton = this;
 	});
 
 	window.onbeforeunload = function(){