diff --git a/src/wp-admin/css/media.css b/src/wp-admin/css/media.css
index 48937571fa..a11a0d3db9 100644
--- a/src/wp-admin/css/media.css
+++ b/src/wp-admin/css/media.css
@@ -875,16 +875,30 @@ border color while dragging a file over the uploader drop area */
 .imgedit-wait {
 	position: absolute;
 	top: 0;
-	background: #fff url(../images/spinner.gif) no-repeat center;
-	-webkit-background-size: 20px 20px;
-	background-size: 20px 20px;
+	bottom: 0;
+	width: 100%;
+	background: #fff;
 	opacity: 0.7;
 	filter: alpha(opacity=70);
-	width: 100%;
-	height: 500px;
 	display: none;
 }
 
+.imgedit-wait:before {
+	content: "";
+	display: block;
+	width: 20px;
+	height: 20px;
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	margin: -10px 0 0 -10px;
+	background: transparent url(../images/spinner.gif) no-repeat center;
+	-webkit-background-size: 20px 20px;
+	background-size: 20px 20px;
+	-webkit-transform: translateZ(0);
+	transform: translateZ(0);
+}
+
 .no-float {
 	float: none;
 }
@@ -1093,7 +1107,7 @@ audio, video {
 @media print,
   (-webkit-min-device-pixel-ratio: 1.25),
   (min-resolution: 120dpi) {
-	.imgedit-wait {
+	.imgedit-wait:before {
 		background-image: url(../images/spinner-2x.gif);
 	}
 }
diff --git a/src/wp-admin/js/image-edit.js b/src/wp-admin/js/image-edit.js
index c50a9d131c..17064cd926 100644
--- a/src/wp-admin/js/image-edit.js
+++ b/src/wp-admin/js/image-edit.js
@@ -56,7 +56,7 @@ var imageEdit = window.imageEdit = {
 		var wait = $('#imgedit-wait-' + postid);
 
 		if ( toggle ) {
-			wait.height( $('#imgedit-panel-' + postid).height() ).fadeIn('fast');
+			wait.fadeIn( 'fast' );
 		} else {
 			wait.fadeOut('fast');
 		}
diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index aaf6962b16..2dcf0f1a4a 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -1721,13 +1721,6 @@
 	position: static;
 }
 
-.media-modal .imgedit-wait {
-	height: auto !important;
-	right: 0;
-	bottom: 0;
-	left: 0;
-}
-
 .media-modal .imgedit-wrap .imgedit-panel-content {
 	padding: 16px;
 	position: absolute;