diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index ca74c3da39..e9cf406020 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -434,29 +434,3 @@ if ( post_type_supports( $post_type, 'comments' ) )
 try{document.post.title.focus();}catch(e){}
 </script>
 <?php endif; ?>
-
-<?php if ( 'attachment' == $post_type ) { ?>
-<script type="text/javascript">
-(function($){
-	function getFieldsContent() {
-		return [ $('#title').val() || '',
-			$('#attachment_caption').val() || '',
-			$('#attachment_alt').val() || '',
-			$('#attachment_content').val() || '',
-			$('#post_name').val() || '' ];
-	}
-
-	var initial = getFieldsContent();
-
-	window.onbeforeunload = function() {
-		var i, changed, current = getFieldsContent();
-		for ( var i = 0; i < initial.length; i++ ) {
- 			if ( changed = ( initial[i] !== current[i]) )
- 				break;
- 		}
- 		if ( changed )
-			return '<?php _e('The changes you made will be lost if you navigate away from this page.'); ?>';
-	};
-})(jQuery);
-</script>
-<?php } ?>
diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php
index 243c2189d8..8fbe7a228a 100644
--- a/wp-admin/post-new.php
+++ b/wp-admin/post-new.php
@@ -46,8 +46,7 @@ if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_
 if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
 	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
 
-if ( 'attachment' !== $post_type )
-	wp_enqueue_script('autosave');
+wp_enqueue_script( 'autosave' );
 
 // Show post form.
 $post = get_default_post_to_edit( $post_type, true );