diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js
index 50a0360882..0f6b84d08a 100644
--- a/wp-admin/js/common.js
+++ b/wp-admin/js/common.js
@@ -402,8 +402,11 @@ $(document).ready( function() {
 			return;
 		button = form.find('input[type="submit"]');
 		input = form.find('input[type="file"]');
+
 		function toggleUploadButton() {
-			button.prop('disabled', '' === input.val());
+			button.prop('disabled', '' === input.map( function() {
+				return $(this).val();
+			}).get().join(''));
 		}
 		toggleUploadButton();
 		input.on('change', toggleUploadButton);
diff --git a/wp-admin/media-upload.php b/wp-admin/media-upload.php
index 6246176b88..8c5dac2894 100644
--- a/wp-admin/media-upload.php
+++ b/wp-admin/media-upload.php
@@ -87,7 +87,7 @@ if ( isset($_GET['inline']) ) {
 
 	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';