diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 3773619ec..ab6be722e 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -1616,6 +1616,7 @@ function get_importers() {
 function current_theme_info() {
 	$themes = get_themes();
 	$current_theme = get_current_theme();
+	$ct->name = $current_theme;
 	$ct->title = $themes[$current_theme]['Title'];
 	$ct->version = $themes[$current_theme]['Version'];
 	$ct->parent_theme = $themes[$current_theme]['Parent Theme'];
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index 8a2327f2a..a17ea3cdc 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -59,7 +59,7 @@ $theme_names = array_keys($themes);
 natcasesort($theme_names);
 
 foreach ($theme_names as $theme_name) {
-	if ( $theme_name == $current_theme )
+	if ( $theme_name == $ct->name )
 		continue;
 	$template = $themes[$theme_name]['Template'];
 	$stylesheet = $themes[$theme_name]['Stylesheet'];