Index: wp-admin/includes/media.php
===================================================================
--- wp-admin/includes/media.php	(revision 13501)
+++ wp-admin/includes/media.php	(working copy)
@@ -1366,6 +1366,9 @@
 	<script type="text/javascript">post_id = <?php echo intval($_REQUEST['post_id']); ?>;</script>
 	<div id="media-upload-header">
 	<?php the_media_upload_tabs(); ?>
+	
+	<div id="autoclose"><input type="checkbox" checked="checked" /> Autoclose</div>
+
 	</div>
 	<?php
 }
Index: wp-admin/js/media-upload.dev.js
===================================================================
--- wp-admin/js/media-upload.dev.js	(revision 13501)
+++ wp-admin/js/media-upload.dev.js	(working copy)
@@ -26,7 +26,8 @@
 		jQuery( edCanvas ).val( jQuery( edCanvas ).val() + h );
 	}
 
-	tb_remove();
+	if ( jQuery('#TB_iframeContent').contents().find('#autoclose :checked').length )
+		tb_remove();
 }
 
 // thickbox settings
Index: wp-admin/css/media.dev.css
===================================================================
--- wp-admin/css/media.dev.css	(revision 13501)
+++ wp-admin/css/media.dev.css	(working copy)
@@ -8,6 +8,11 @@
 	height: 2.5em;
 }
 
+div#autoclose {
+	float: right;
+	margin: 5px 6px 0 0;
+}
+
 body#media-upload ul#sidemenu {
 	font-weight: normal;
 	margin: 0 5px;