diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index 478dfdd768..dce7e68fb6 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -391,6 +391,8 @@ function media_buttons($editor_id = 'content') {
 
 	$img = '<span class="wp-media-buttons-icon"></span> ';
 
+	error_log( 'MEDIA_BUTTONS ' . print_r( func_get_args(), true ) );
+
 	echo '<a href="#" class="button insert-media add_media" data-editor="' . esc_attr( $editor_id ) . '" title="' . esc_attr__( 'Add Media' ) . '">' . $img . __( 'Add Media' ) . '</a>';
 
 	echo '<a href="' . esc_url( get_upload_iframe_src() ) . '" class="thickbox add_media" id="' . esc_attr( $editor_id ) . '-add_media" title="' . esc_attr__( 'Add Media' ) . '" onclick="return false;">' . sprintf( $context, $img ) . '</a>';
diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js
index f7528b1310..c33b7ef223 100644
--- a/wp-admin/js/media-upload.js
+++ b/wp-admin/js/media-upload.js
@@ -434,7 +434,7 @@ var tb_position;
 		},
 
 		init: function() {
-			$('#wpbody').on('click', '.insert-media', function( event ) {
+			$(document.body).on('click', '.insert-media', function( event ) {
 				var $this = $(this),
 					editor = $this.data('editor'),
 					workflow;
@@ -448,7 +448,7 @@ var tb_position;
 				// See: http://core.trac.wordpress.org/ticket/22445
 				$this.blur();
 
-				if ( ! editor )
+				if ( ! _.isString( editor ) )
 					return;
 
 				workflow = wp.media.editor.get( editor );