diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index 02e5ee7617..0ae6a85d5f 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -1137,11 +1137,12 @@ body.show-upload-theme .upload-theme + .wp-filter + .theme-browser {
 }
 
 p.no-themes {
+	clear: both;
 	color: #999;
 	font-size: 18px;
 	font-style: normal;
 	margin: 0;
-	padding: 0;
+	padding: 100px 0 0;
 	text-align: center;
 	display: none;
 }
diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index f445082d41..83c67a2f29 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -79,7 +79,8 @@ themes.view.Appearance = wp.Backbone.View.extend({
 
 		// Render and append
 		this.view.render();
-		this.$el.empty().append( this.view.el ).addClass('rendered');
+		this.$el.find( '.themes' ).remove();
+		this.$el.append( this.view.el ).addClass( 'rendered' );
 		this.$el.append( '<br class="clear"/>' );
 	},
 
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index d42091d676..0443ba854e 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -166,10 +166,10 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 			</div>
 		</div>
 	</div>
-	<div class="theme-browser content-filterable"></div>
+	<div class="theme-browser content-filterable" aria-live="polite">
+		<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
+	</div>
 	<div class="theme-install-overlay wp-full-overlay expanded"></div>
-
-	<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 	<span class="spinner"></span>
 
 	<br class="clear" />
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index bf265b8f60..52e3531250 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -198,7 +198,7 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
 
 ?>
 
-<div class="theme-browser">
+<div class="theme-browser" aria-live="polite">
 	<div class="themes">
 
 <?php
@@ -250,11 +250,10 @@ foreach ( $themes as $theme ) :
 <?php endforeach; ?>
 	<br class="clear" />
 	</div>
+	<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 </div>
 <div class="theme-overlay"></div>
 
-<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
-
 <?php
 // List broken themes, if any.
 if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {