diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index 7ba6dad91..959317a6b 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -65,6 +65,7 @@ switch($action) {
 		} else {
 			$form_trackback = '';
 		}
+		$saveasdraft = '<input name="save" type="submit" id="save" tabindex="6" value="Save and Continue Editing" />';
 		break;
 	case "editcomment":
 		$submitbutton_text = 'Edit this!';
diff --git a/wp-admin/post.php b/wp-admin/post.php
index b0ef0a265..ef3680e1f 100644
--- a/wp-admin/post.php
+++ b/wp-admin/post.php
@@ -341,9 +341,12 @@ switch($action) {
 			}
         } // end if publish
         
-
-        $location = "Location: post.php";
-        header ($location);
+		if ($HTTP_POST_VARS['save']) {
+			$location = $HTTP_SERVER_VARS['HTTP_REFERER'];
+		} else {
+        	$location = 'post.php';
+		}
+        header ('Location: ' . $location);
         break;
 
     case 'delete':