diff --git a/wp-admin/css/wp-admin.dev.css b/wp-admin/css/wp-admin.dev.css
index 3ff576ea8..3a5b9481a 100644
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@@ -3687,14 +3687,14 @@ abbr.required {
 .media-upload-form .media-item.error p,
 .media-item .error-div {
 	line-height: 16px;
-	font-size: 12px;
-	margin: 10px;
+	margin: 5px 10px;
 	padding: 0;
 }
 
 .media-item .error-div a.dismiss {
+	display: block;
 	float: right;
-	padding-left: 15px;
+	margin: 5px 4px 0 15px;
 }
 
 /*------------------------------------------------------------------------------
diff --git a/wp-includes/js/plupload/handlers.dev.js b/wp-includes/js/plupload/handlers.dev.js
index 7dd25db38..faabdf504 100644
--- a/wp-includes/js/plupload/handlers.dev.js
+++ b/wp-includes/js/plupload/handlers.dev.js
@@ -83,7 +83,7 @@ function uploadSuccess(fileObj, serverData) {
 	serverData = serverData.replace(/^<pre>(\d+)<\/pre>$/, '$1');
 
 	// if async-upload returned an error message, place it in the media item div and return
-	if ( serverData.match('media-upload-error') ) {
+	if ( serverData.match(/media-upload-error|error-div/) ) {
 		item.html(serverData);
 		return;
 	} else {