Index: media.php
===================================================================
--- media.php	(revision 13012)
+++ media.php	(working copy)
@@ -89,7 +89,7 @@
 <?php screen_icon(); ?>
 <h2><?php _e( 'Edit Media' ); ?></h2>
 
-<form method="post" action="<?php echo esc_url( remove_query_arg( 'message' ) ); ?>" class="media-upload-form" id="media-single-form">
+<form method="post" action="<?php echo esc_url( remove_query_arg( array('message','action','attachment_id') ) ); ?>" class="media-upload-form" id="media-single-form">
 <p class="submit" style="padding-bottom: 0;">
 <input type="submit" class="button-primary" name="save" value="<?php esc_attr_e('Update Media'); ?>" />
 </p>