diff --git wp-admin/edit-form-advanced.php wp-admin/edit-form-advanced.php
index 1c9921a..eb87ecd 100644
--- wp-admin/edit-form-advanced.php
+++ wp-admin/edit-form-advanced.php
@@ -17,11 +17,6 @@ if ( wp_is_mobile() )
 
 if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
 	add_thickbox();
-
-	wp_enqueue_script( 'media-upload' );
-	wp_enqueue_style( 'media-views' );
-	wp_plupload_default_settings();
-	add_action( 'admin_footer', 'wp_print_media_templates' );
 }
 
 /**
diff --git wp-admin/includes/media.php wp-admin/includes/media.php
index 0e5f40d..1ad3c0d 100644
--- wp-admin/includes/media.php
+++ wp-admin/includes/media.php
@@ -381,6 +381,7 @@ function media_buttons($editor_id = 'content') {
 	wp_enqueue_style( 'media-views' );
 	wp_plupload_default_settings();
 	add_action( 'admin_footer', 'wp_print_media_templates' );
+	add_action( 'wp_footer', 'wp_print_media_templates' );
 
 	$context = apply_filters('media_buttons_context', __('Upload/Insert %s'));