diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 05dff8478f..21c60f584a 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -152,7 +152,7 @@ endforeach;
 <?php echo $form_prevstatus ?>
 
 
-<p class="submit"><?php echo $saveasdraft; ?> <input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" /> 
+<p class="submit"><span id="autosave"></span><?php echo $saveasdraft; ?> <input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" /> 
 <?php 
 if ('publish' != $post->post_status || 0 == $post_ID) {
 ?>
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 2430393fb8..a27fc4e99e 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -138,6 +138,7 @@ endforeach;
 </fieldset>
 
 <p class="submit">
+<span id="autosave"></span>
 <input name="save" type="submit" id="save" tabindex="3" value="<?php _e('Save and Continue Editing'); ?>" />
 <input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" /> 
 <?php 
diff --git a/wp-includes/js/autosave.js.php b/wp-includes/js/autosave.js.php
index d5d716fc95..768c917b49 100644
--- a/wp-includes/js/autosave.js.php
+++ b/wp-includes/js/autosave.js.php
@@ -7,10 +7,6 @@ header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT")
 
 
 ?>
-function autosave_adddiv() {
-	var buttons = document.getElementsByClassName('submit')[0].innerHTML;
-	document.getElementsByClassName('submit')[0].innerHTML = '<span id="autosave"></span>' + buttons;
-}
 function autosave_timer() {
 	autosave();
 	setTimeout("autosave_timer()", <?php echo apply_filters('autosave_interval', '60000') ?>);
@@ -20,7 +16,6 @@ function autosave_start_timer() {
 	setTimeout("autosave_timer()", <?php echo apply_filters('autosave_start_delay', '60000') ?>);
 }
 addLoadEvent(autosave_start_timer)
-addLoadEvent(autosave_adddiv);
 
 function autosave_cur_time() {
 	var now = new Date();