diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 750533dc60..9c63251edc 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2533,6 +2533,11 @@ body.index-php .tb-close-icon {
 	transition: color .1s ease-in-out, background .1s ease-in-out;
 }
 
+body.plugin-install-php #TB_closeWindowButton:focus .tb-close-icon,
+body.import-php #TB_closeWindowButton:focus .tb-close-icon,
+body.plugins-php #TB_closeWindowButton:focus .tb-close-icon,
+body.update-core-php #TB_closeWindowButton:focus .tb-close-icon,
+body.index-php #TB_closeWindowButton:focus .tb-close-icon,
 body.plugin-install-php .tb-close-icon:focus,
 body.plugin-install-php .tb-close-icon:hover,
 body.import-php .tb-close-icon:focus,
diff --git a/src/wp-admin/js/plugin-install.js b/src/wp-admin/js/plugin-install.js
index d162a0da6d..d58c77953d 100644
--- a/src/wp-admin/js/plugin-install.js
+++ b/src/wp-admin/js/plugin-install.js
@@ -42,7 +42,10 @@ jQuery( document ).ready( function( $ ) {
 		tb_click.call(this);
 
 		$('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
-		$('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).data( 'title' ) );
+		$('#TB_ajaxWindowTitle').html( '<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).data( 'title' ) );
+		$('#TB_iframeContent').attr( 'title', plugininstallL10n.plugin_information + ' ' + $(this).data( 'title' ) );
+		$('#TB_closeWindowButton').focus();
+
 		return false;
 	});