diff --git src/wp-includes/js/media-views.js src/wp-includes/js/media-views.js
index fd40f31..7823cb2 100644
--- src/wp-includes/js/media-views.js
+++ src/wp-includes/js/media-views.js
@@ -5601,8 +5601,8 @@
 		 * @param {Object} event
 		 */
 		editAttachment: function( event ) {
-			var editState = this.controller.state( 'edit-image' );
-			if ( window.imageEdit ) {
+			var editState = this.controller.states.get( 'edit-image' );
+			if ( window.imageEdit && editState ) {
 				event.preventDefault();
 
 				editState.set( 'image', this.model );
@@ -5959,9 +5959,9 @@
 		},
 
 		editAttachment: function( event ) {
-			var editState = this.controller.state( 'edit-image' );
+			var editState = this.controller.states.get( 'edit-image' );
 
-			if ( window.imageEdit ) {
+			if ( window.imageEdit && editState ) {
 				event.preventDefault();
 				editState.set( 'image', this.model.attachment );
 				this.controller.setState( 'edit-image' );