diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 35524129c4..6561dacf84 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -1218,7 +1218,7 @@ function media_upload_form( $errors = null ) {
 <?php if ( $flash ) : ?>
 <script type="text/javascript">
 <!--
-jQuery(function($){
+SWFUpload.onload = function() {
 	swfu = new SWFUpload({
 			button_text: '<span class="button"><?php _e('Upload'); ?></span>',
 			button_text_style: '.button { text-align: center; font-weight: bold; font-family:"Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana,sans-serif; }',
@@ -1256,7 +1256,7 @@ jQuery(function($){
 			},
 			debug: false
 		});
-});
+};
 //-->
 </script>
 
diff --git a/wp-includes/js/swfupload/handlers.js b/wp-includes/js/swfupload/handlers.js
index 73f354eefd..1f7fee714d 100644
--- a/wp-includes/js/swfupload/handlers.js
+++ b/wp-includes/js/swfupload/handlers.js
@@ -206,8 +206,11 @@ function fileDialogComplete(num_files_queued) {
 }
 
 function swfuploadPreLoad() {
+	var swfupload_element = jQuery('#'+swfu.customSettings.swfupload_element_id).get(0);
 	jQuery('#' + swfu.customSettings.degraded_element_id).hide();
-	jQuery('#' + swfu.customSettings.swfupload_element_id).show();
+	// Doing this directly because jQuery().show() seems to have timing problems
+	if ( swfupload_element && ! swfupload_element.style.display )
+			swfupload_element.style.display = 'block';
 }
 
 function swfuploadLoadFailed() {
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 41f29ad8bd..49d163d32c 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -109,7 +109,7 @@ function wp_default_scripts( &$scripts ) {
 		'is_lighttpd_before_150' => is_lighttpd_before_150(),
 	) );
 	$scripts->add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2.2.0-20081031');
-	$scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081031');
+	$scripts->add( 'swfupload-handlers', '/wp-includes/js/swfupload/handlers.js', array('swfupload'), '2.2.0-20081101');
 	// these error messages came from the sample swfupload js, they might need changing.
 	$scripts->localize( 'swfupload-handlers', 'swfuploadL10n', array(
 			'queue_limit_exceeded' => __('You have attempted to queue too many files.'),