diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index fcd66070a9..4c7b55b411 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -362,6 +362,7 @@
 
 		initialize: function() {
 			var self = this;
+
 			media.view.Frame.prototype.initialize.apply( this, arguments );
 
 			_.defaults( this.options, {
@@ -371,12 +372,16 @@
 
 			this.gridRouter = this.options.gridRouter;
 			this.library = this.options.library;
+
 			if ( this.options.model ) {
 				this.model = this.options.model;
 			} else {
 				this.model = this.library.at( 0 );
 			}
 
+			// Close the modal if the attachment is deleted.
+			this.listenTo( this.model, 'destroy', this.close, this );
+
 			this.createStates();
 
 			this.on( 'content:create:edit-metadata', this.editMetadataMode, this );
@@ -385,7 +390,7 @@
 
 			// Bind default title creation.
 			this.on( 'title:create:default', this.createTitle, this );
-			this.title.mode('default');
+			this.title.mode( 'default' );
 
 			this.options.hasPrevious = this.hasPrevious();
 			this.options.hasNext = this.hasNext();