diff --git a/wp-admin/media.php b/wp-admin/media.php
index 0df44e9d6..dae8c24dd 100644
--- a/wp-admin/media.php
+++ b/wp-admin/media.php
@@ -9,8 +9,14 @@ wp_reset_vars(array('action'));
 
 switch( $action ) :
 case 'editattachment' :
-	$errors = media_upload_form_handler();
 	$attachment_id = (int) $_POST['attachment_id'];
+	check_admin_referer('media-form');
+
+	if ( !current_user_can('edit_post', $attachment_id) )
+		wp_die ( __('You are not allowed to edit this attachment.') );
+
+	$errors = media_upload_form_handler();
+
 
 	check_admin_referer('media-form');