diff --git a/src/wp-includes/css/media-views.css b/src/wp-includes/css/media-views.css
index 8ce7b41941..e0dc53a4b4 100644
--- a/src/wp-includes/css/media-views.css
+++ b/src/wp-includes/css/media-views.css
@@ -259,7 +259,8 @@
 	bottom: auto;
 	border-left: none;
 	padding: 16px;
-	box-shadow: -1px 0px 1px rgba(0,0,0,.3);
+	-webkit-box-shadow: -1px 0 1px rgba(0,0,0,.3);
+	box-shadow: -1px 0 1px rgba(0,0,0,.3);
 }
 
 .upload-php .mode-grid .media-sidebar .media-uploader-status {
diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 45c4601e81..ad2f4d7784 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -226,11 +226,7 @@
 		},
 
 		sidebarVisibility: function() {
-			if ( this.errors.length ) {
-				this.browserView.$( '.media-sidebar' ).show();
-			} else {
-				this.browserView.$( '.media-sidebar' ).hide();
-			}
+			this.browserView.$( '.media-sidebar' ).toggle( !! this.errors.length );
 		},
 
 		bindDeferred: function() {
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 59d78d264d..053c07e640 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -5979,7 +5979,7 @@
 			this.uploader = new media.view.UploaderInline({
 				controller: this.controller,
 				status:     false,
-				message:    l10n.noItemsFound,
+				message:    this.controller.isModeActive( 'grid' ) ? '' : l10n.noItemsFound,
 				canClose:   this.controller.isModeActive( 'grid' )
 			});
 
@@ -6011,15 +6011,18 @@
 
 			this.views.add( this.attachments );
 
-			this.attachmentsNoResults = new media.View({
-				controller: this.controller,
-				tagName: 'p'
-			});
 
-			this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
-			this.attachmentsNoResults.$el.html( l10n.noMedia );
+			if ( this.controller.isModeActive( 'grid' ) ) {
+				this.attachmentsNoResults = new media.View({
+					controller: this.controller,
+					tagName: 'p'
+				});
 
-			this.views.add( this.attachmentsNoResults );
+				this.attachmentsNoResults.$el.addClass( 'hidden no-media' );
+				this.attachmentsNoResults.$el.html( l10n.noMedia );
+
+				this.views.add( this.attachmentsNoResults );
+			}
 		},
 
 		createSidebar: function() {
diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php
index e524fc18ee..f8f104a2c6 100644
--- a/src/wp-includes/media-template.php
+++ b/src/wp-includes/media-template.php
@@ -185,9 +185,9 @@ function wp_print_media_templates() {
 
 		<?php else : ?>
 			<div class="upload-ui">
-				<h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files here' ); ?></h3>
+				<h3 class="upload-instructions drop-instructions"><?php _e( 'Drop files anywhere to upload' ); ?></h3>
 				<p class="upload-instructions drop-instructions"><?php _ex( 'or', 'Uploader: Drop files here - or - Select Files' ); ?></p>
-				<a href="#" class="browser button"><?php _e( 'Select Files' ); ?></a>
+				<a href="#" class="browser button button-hero"><?php _e( 'Select Files' ); ?></a>
 			</div>
 
 			<div class="upload-inline-status"></div>