diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 8f44820392..c3edcf182a 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -136,7 +136,7 @@
 					toolbar:            'select',
 					contentUserSetting: false,
 					filterable:         'all',
-					autoSelect:         false 
+					autoSelect:         false
 				})
 			]);
 		},
@@ -583,12 +583,17 @@
 		initialize: function() {
 			media.view.Button.prototype.initialize.apply( this, arguments );
 			this.listenTo( this.controller, 'select:activate select:deactivate', this.toggleBulkEditHandler );
+			this.listenTo( this.controller, 'selection:action:done', this.back );
+		},
+
+		back: function () {
+			this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
 		},
 
 		click: function() {
 			media.view.Button.prototype.click.apply( this, arguments );
 			if ( this.controller.isModeActive( 'select' ) ) {
-				this.controller.deactivateMode( 'select' ).activateMode( 'edit' );
+				this.back();
 			} else {
 				this.controller.deactivateMode( 'edit' ).activateMode( 'select' );
 			}
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 3698087f74..f65d4d2740 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -5864,7 +5864,7 @@
 					controller: this.controller,
 					priority: -60,
 					click: function() {
-						var model, changed = [],
+						var model, changed = [], self = this,
 							selection = this.controller.state().get( 'selection' ),
 							library = this.controller.state().get( 'library' );
 
@@ -5901,6 +5901,7 @@
 						if ( changed.length ) {
 							$.when.apply( null, changed ).then( function() {
 								library._requery( true );
+								self.controller.trigger( 'selection:action:done' );
 							} );
 						}
 					}