diff --git a/src/wp-includes/js/media-editor.js b/src/wp-includes/js/media-editor.js
index 9d84a4b271..5bf5bd3ffa 100644
--- a/src/wp-includes/js/media-editor.js
+++ b/src/wp-includes/js/media-editor.js
@@ -670,6 +670,7 @@
 		 */
 		frame: function() {
 			if ( this._frame ) {
+				wp.media.frame = this._frame;
 				return this._frame;
 			}
 
@@ -1067,6 +1068,8 @@
 				workflow = this.add( id, options );
 			}
 
+			wp.media.frame = workflow;
+
 			return workflow.open();
 		},