diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 43dfd0ed6b..e4d7f8968c 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3323,7 +3323,7 @@ function _admin_search_query() {
  * @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued).
  *
  */
-function iframe_header( $title = '', $limit_styles = false) {
+function iframe_header( $title = '', $limit_styles = false ) {
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
 <head>
@@ -3358,10 +3358,16 @@ do_action('admin_head');
  *
  */
 function iframe_footer() {
-	echo '
-	<script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
-	</body>
-</html>';
+	//We're going to hide any footer output on iframe pages, but run the hooks anyway since they output Javascript or other needed content. ?>
+	<div class="hidden">
+<?php
+	do_action('admin_footer', '');
+	do_action('admin_print_footer_scripts'); ?>
+	</div>
+<script type="text/javascript">if(typeof wpOnload=="function")wpOnload();</script>
+</body>
+</html>
+<?php
 }
 
 function _post_states($post) {
diff --git a/wp-admin/plugin-install.php b/wp-admin/plugin-install.php
index 75a3de4378..82dd3f8662 100644
--- a/wp-admin/plugin-install.php
+++ b/wp-admin/plugin-install.php
@@ -18,9 +18,6 @@ $title = __('Install Plugins');
 $parent_file = 'plugins.php';
 
 wp_reset_vars( array('tab', 'paged') );
-wp_enqueue_style( 'plugin-install' );
-wp_enqueue_script( 'plugin-install' );
-add_thickbox();
 
 //These are the tabs which are shown on the page,
 $tabs = array();
@@ -46,6 +43,11 @@ if( empty($tab) || ( ! isset($tabs[ $tab ]) && ! in_array($tab, (array)$nonmenu_
 if( empty($paged) )
 	$paged = 1;
 
+wp_enqueue_style( 'plugin-install' );
+wp_enqueue_script( 'plugin-install' );
+if ( 'plugin-information' != $tab )
+	add_thickbox();
+
 $body_id = $tab;
 
 do_action('install_plugins_pre_' . $tab); //Used to override the general interface, Eg, install or plugin information.
@@ -71,4 +73,4 @@ foreach ( (array)$tabs as $action => $text ) {
 	<?php do_action('install_plugins_' . $tab, $paged); ?>
 </div>
 <?php
-include('admin-footer.php');
\ No newline at end of file
+include('admin-footer.php');
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 876dbff988..3485bd67d7 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -369,7 +369,7 @@ function wp_default_scripts( &$scripts ) {
 			'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};'
 		) );
 
-		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'thickbox', 'jquery' ), '20090506' );
+		$scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery' ), '20090506' );
 		$scripts->add_data( 'plugin-install', 'group', 1 );
 		$scripts->localize( 'plugin-install', 'plugininstallL10n', array(
 			'plugin_information' => __('Plugin Information:'),
