Index: wp-admin/js/common.js
===================================================================
--- wp-admin/js/common.js	(revision 22585)
+++ wp-admin/js/common.js	(working copy)
@@ -395,7 +395,7 @@
 		if ( ! form.length )
 			return;
 		button = form.find('input[type="submit"]');
-		input = form.find('input[type="file"]');
+		input = button.prev('input[type="file"]');
 		function toggleUploadButton() {
 			button.prop('disabled', '' === input.val());
 		}
Index: wp-admin/media-upload.php
===================================================================
--- wp-admin/media-upload.php	(revision 22585)
+++ wp-admin/media-upload.php	(working copy)
@@ -87,7 +87,7 @@
 
 	require_once('./admin-header.php');
 
-	$form_class = 'media-upload-form type-form validate';
+	$form_class = 'media-upload-form wp-upload-form type-form validate';
 
 	if ( get_user_setting('uploader') )
 		$form_class .= ' html-uploader';