diff --git a/src/js/media/views/frame/select.js b/src/js/media/views/frame/select.js
index 5cb4a5402d..acb58906c9 100644
--- a/src/js/media/views/frame/select.js
+++ b/src/js/media/views/frame/select.js
@@ -58,6 +58,16 @@ Select = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.Select.prototype
 		};
 	},
 
+	editImageContent: function() {
+		var image = this.state().get('image'),
+			view = new wp.media.view.EditImage( { model: image, controller: this } ).render();
+
+		this.content.set( view );
+
+		// after creating the wrapper view, load the actual editor via an ajax call
+		view.loadEditor();
+	},
+
 	/**
 	 * Create the default states on the frame.
 	 */
@@ -76,7 +86,8 @@ Select = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.Select.prototype
 				multiple:  options.multiple,
 				title:     options.title,
 				priority:  20
-			})
+			}),
+			new wp.media.controller.EditImage( { model: options.editImage } )
 		]);
 	},
 
@@ -91,6 +102,7 @@ Select = MediaFrame.extend(/** @lends wp.media.view.MediaFrame.Select.prototype
 		this.on( 'content:create:browse', this.browseContent, this );
 		this.on( 'content:render:upload', this.uploadContent, this );
 		this.on( 'toolbar:create:select', this.createSelectToolbar, this );
+		this.on( 'content:render:edit-image', this.editImageContent, this );
 	},
 
 	/**