diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 5d3f0a1d9a..f56e2eb859 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2255,6 +2255,7 @@ div.action-links {
 	right: 0;
 	left: 0;
 	min-height: 100%;
+	min-height: -webkit-calc( 100% - 346px );
 	min-height: calc( 100% - 346px );
 }
 
diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 12e5a6bcea..9d982b3d41 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -1,4 +1,4 @@
-/* global _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings, confirm */
+/* global _wpMediaViewsL10n, MediaElementPlayer, _wpMediaGridSettings */
 (function($, _, Backbone, wp) {
 	// Local reference to the WordPress media namespace.
 	var media = wp.media, l10n;
@@ -157,7 +157,7 @@
 			}
 
 			$browser = this.$('.attachments-browser');
-			$toolbar = $browser.find('.media-toolbar')
+			$toolbar = $browser.find('.media-toolbar');
 
 			if ( $browser.offset().top < this.$window.scrollTop() + this.$adminBar.height() ) {
 				$browser.addClass( 'fixed' );
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 6ee9778251..ce1cb4be60 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -5718,8 +5718,9 @@
 				priority: 50
 			};
 
-			if ( media.view.settings.mediaTrash
-				&& this.controller.activeModes.where( { id: 'grid' } ).length ) {
+			if ( media.view.settings.mediaTrash &&
+				this.controller.activeModes.where( { id: 'grid' } ).length ) {
+
 				filters.trash = {
 					text:  l10n.trash,
 					props: {
@@ -5882,9 +5883,10 @@
 							return;
 						}
 
-						if ( media.view.settings.mediaTrash
-							&& 'trash' !== selection.at( 0 ).get( 'status' )
-							&& ! confirm( l10n.warnBulkTrash ) ) {
+						if ( media.view.settings.mediaTrash &&
+							'trash' !== selection.at( 0 ).get( 'status' ) &&
+							! confirm( l10n.warnBulkTrash ) ) {
+
 							return;
 						}
 
@@ -6514,8 +6516,9 @@
 			var library = this.controller.library;
 			event.preventDefault();
 
-			if ( media.view.settings.mediaTrash
-				&& 'edit-metadata' === this.controller.content.mode() ) {
+			if ( media.view.settings.mediaTrash &&
+				'edit-metadata' === this.controller.content.mode() ) {
+
 				this.model.set( 'status', 'trash' );
 				this.model.save().done( function() {
 					library._requery( true );