diff --git a/src/wp-includes/js/media-grid.js b/src/wp-includes/js/media-grid.js
index 019a964318..b1f0428838 100644
--- a/src/wp-includes/js/media-grid.js
+++ b/src/wp-includes/js/media-grid.js
@@ -216,26 +216,12 @@
 
 			// Handle a frame-level event for editing an attachment.
 			this.on( 'edit:attachment', this.editAttachment, this );
-			this.on( 'edit:attachment:next', this.editNextAttachment, this );
-			this.on( 'edit:attachment:previous', this.editPreviousAttachment, this );
 		},
 
 		addNewClickHandler: function() {
 			this.trigger( 'show:upload:attachment' );
 		},
 
-		editPreviousAttachment: function( currentModel ) {
-			var library = this.state().get('library'),
-				currentModelIndex = library.indexOf( currentModel );
-			this.trigger( 'edit:attachment', library.at( currentModelIndex - 1 ) );
-		},
-
-		editNextAttachment: function( currentModel ) {
-			var library = this.state().get('library'),
-				currentModelIndex = library.indexOf( currentModel );
-			this.trigger( 'edit:attachment', library.at( currentModelIndex + 1 ) );
-		},
-
 		/**
 		 * Open the Edit Attachment modal.
 		 */
@@ -244,15 +230,13 @@
 				library = this.state().get('library');
 
 			// Create a new EditAttachment frame, passing along the library and the attachment model.
-			this.editAttachmentFrame = new media.view.Frame.EditAttachments({
+			this.editAttachmentFrame = wp.media( {
+				frame:       'edit-attachments',
 				gridRouter:  this.gridRouter,
 				library:     library,
 				model:       model
-			});
+			} );
 
-			// Listen to events on the edit attachment frame for triggering pagination callback handlers.
-			this.listenTo( this.editAttachmentFrame, 'edit:attachment:next', this.editNextAttachment );
-			this.listenTo( this.editAttachmentFrame, 'edit:attachment:previous', this.editPreviousAttachment );
 			// Listen to keyboard events on the modal
 			$( 'body' ).on( 'keydown.media-modal', function( e ) {
 				self.editAttachmentFrame.keyEvent( e );
@@ -385,7 +369,7 @@
 	 *
 	 * Requires an attachment model to be passed in the options hash under `model`.
 	 */
-	media.view.Frame.EditAttachments = media.view.Frame.extend({
+	media.view.MediaFrame.EditAttachments = media.view.Frame.extend({
 
 		className: 'edit-attachment-frame',
 		template: media.template( 'edit-attachment-frame' ),
@@ -535,6 +519,16 @@
 			});
 		},
 
+		resetContent: function() {
+			this.modal.close();
+			wp.media( {
+				frame:       'edit-attachments',
+				gridRouter:  this.gridRouter,
+				library:     this.library,
+				model:       this.model
+			} );
+		},
+
 		/**
 		 * Click handler to switch to the previous media item.
 		 */
@@ -542,8 +536,8 @@
 			if ( ! this.hasPrevious() ) {
 				return;
 			}
-			this.modal.close();
-			this.trigger( 'edit:attachment:previous', this.model );
+			this.model = this.library.at( this.getCurrentIndex() - 1 );
+			this.resetContent();
 		},
 
 		/**
@@ -553,8 +547,8 @@
 			if ( ! this.hasNext() ) {
 				return;
 			}
-			this.modal.close();
-			this.trigger( 'edit:attachment:next', this.model );
+			this.model = this.library.at( this.getCurrentIndex() + 1 );
+			this.resetContent();
 		},
 
 		getCurrentIndex: function() {
diff --git a/src/wp-includes/js/media-models.js b/src/wp-includes/js/media-models.js
index 9ba5f5e789..78d7d7f9ca 100644
--- a/src/wp-includes/js/media-models.js
+++ b/src/wp-includes/js/media-models.js
@@ -38,6 +38,8 @@ window.wp = window.wp || {};
 			frame = new MediaFrame.AudioDetails( attributes );
 		} else if ( 'video' === attributes.frame && MediaFrame.VideoDetails ) {
 			frame = new MediaFrame.VideoDetails( attributes );
+		} else if ( 'edit-attachments' === attributes.frame && MediaFrame.EditAttachments ) {
+			frame = new MediaFrame.EditAttachments( attributes );
 		}
 
 		delete attributes.frame;