Index: src/wp-includes/js/media-grid.js
===================================================================
--- src/wp-includes/js/media-grid.js	(revision 29532)
+++ src/wp-includes/js/media-grid.js	(working copy)
@@ -135,7 +135,8 @@
 					content:            'browse',
 					toolbar:            'select',
 					contentUserSetting: false,
-					filterable:         'all'
+					filterable:         'all',
+					autoSelect:         false
 				})
 			]);
 		},
Index: src/wp-includes/js/media-views.js
===================================================================
--- src/wp-includes/js/media-views.js	(revision 29532)
+++ src/wp-includes/js/media-views.js	(working copy)
@@ -594,7 +594,7 @@
 			searchable:         true,
 			filterable:         false,
 			sortable:           true,
-
+			autoSelect:         true,
 			describe:           false,
 			// Uses a user setting to override the content mode.
 			contentUserSetting: true,
@@ -751,8 +751,11 @@
 			if ( 'upload' === content.mode() ) {
 				this.frame.content.mode('browse');
 			}
-			this.get('selection').add( attachment );
 
+			if ( this.get('autoSelect') ) {
+				this.get('selection').add( attachment );
+			}
+
 			// Set focus back to where it goes when an attachment is selected.
 			$( '.attachments-browser .attachments .attachment' ).first().focus();
 		},
@@ -5719,7 +5722,7 @@
 			};
 
 			if ( media.view.settings.mediaTrash &&
-				this.controller.activeModes.where( { id: 'grid' } ).length ) {
+				this.controller.isModeActive( 'grid' ) ) {
 
 				filters.trash = {
 					text:  l10n.trash,
@@ -5835,7 +5838,7 @@
 			// Feels odd to bring the global media library switcher into the Attachment
 			// browser view. Is this a use case for doAction( 'add:toolbar-items:attachments-browser', this.toolbar );
 			// which the controller can tap into and add this view?
-			if ( this.controller.activeModes.where( { id: 'grid' } ).length ) {
+			if ( this.controller.isModeActive( 'grid' ) ) {
 				LibraryViewSwitcher = media.View.extend({
 					className: 'view-switch media-grid-view-switch',
 					template: media.template( 'media-library-view-switcher')