diff --git a/src/wp-admin/js/media.js b/src/wp-admin/js/media.js
index 119c10bd2a..a071cd6001 100644
--- a/src/wp-admin/js/media.js
+++ b/src/wp-admin/js/media.js
@@ -72,11 +72,15 @@ var findPosts;
 	};
 
 	$( document ).ready( function() {
+		var $mediaGridWrap = $( '#wp-media-grid' );
+
 		// Open up a manage media frame into the grid.
-		wp.media && wp.media({
-			frame: 'manage',
-			container: $('#wpbody-content > .wrap')
-		}).open();
+		if ( $mediaGridWrap.length && window.wp && window.wp.media ) {
+			window.wp.media({
+				frame: 'manage',
+				container: $mediaGridWrap
+			}).open();
+		}
 
 		$( '#find-posts-submit' ).click( function( event ) {
 			if ( ! $( '#find-posts-response input[type="radio"]:checked' ).length )
diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php
index 646381e94a..dbdf3100b5 100644
--- a/src/wp-admin/upload.php
+++ b/src/wp-admin/upload.php
@@ -57,7 +57,7 @@ if ( 'grid' === $mode ) {
 
 	require_once( ABSPATH . 'wp-admin/admin-header.php' );
 	?>
-	<div class="wrap">
+	<div class="wrap" id="wp-media-grid">
 		<h2>
 		<?php
 		echo esc_html( $title );