diff --git a/src/wp-admin/css/themes.css b/src/wp-admin/css/themes.css
index 89fafd5f14..8256b86684 100644
--- a/src/wp-admin/css/themes.css
+++ b/src/wp-admin/css/themes.css
@@ -9,7 +9,6 @@
 
 .theme-browser .themes {
 	clear: both;
-	padding: 0 0 100px;
 }
 
 .themes-php .wrap h1 {
@@ -1124,13 +1123,15 @@ p.no-themes {
 	font-size: 18px;
 	font-style: normal;
 	margin: 0;
-	padding: 0;
+	padding: 100px 0;
 	text-align: center;
 	display: none;
 }
+
 body.no-results p.no-themes {
 	display: block;
 }
+
 body.show-upload-theme p.no-themes {
 	display: none !important;
 }
diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js
index c655a5c18b..f74ecfdf7f 100644
--- a/src/wp-admin/js/theme.js
+++ b/src/wp-admin/js/theme.js
@@ -80,7 +80,6 @@ themes.view.Appearance = wp.Backbone.View.extend({
 		// Render and append
 		this.view.render();
 		this.$el.empty().append( this.view.el ).addClass( 'rendered' );
-		this.$el.append( '<br class="clear"/>' );
 	},
 
 	// Defines search element container
@@ -838,7 +837,7 @@ themes.view.Preview = themes.view.Details.extend({
 // a wrapper that will hold all the theme elements
 themes.view.Themes = wp.Backbone.View.extend({
 
-	className: 'themes',
+	className: 'themes wp-clearfix',
 	$overlay: $( 'div.theme-overlay' ),
 
 	// Number to keep track of scroll position
diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php
index 6bcd7cdc98..af038262c9 100644
--- a/src/wp-admin/theme-install.php
+++ b/src/wp-admin/theme-install.php
@@ -195,7 +195,6 @@ include(ABSPATH . 'wp-admin/admin-header.php');
 	<p class="no-themes"><?php _e( 'No themes found. Try a different search.' ); ?></p>
 	<span class="spinner"></span>
 
-	<br class="clear" />
 <?php
 if ( $tab ) {
 	/**
diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
index bf65884fb2..2724755df5 100644
--- a/src/wp-admin/themes.php
+++ b/src/wp-admin/themes.php
@@ -229,7 +229,7 @@ if ( ! $ct->errors() || ( 1 == count( $ct->errors()->get_error_codes() )
 ?>
 
 <div class="theme-browser">
-	<div class="themes">
+	<div class="themes wp-clearfix">
 
 <?php
 /*
@@ -282,7 +282,6 @@ foreach ( $themes as $theme ) :
 	<?php } ?>
 </div>
 <?php endforeach; ?>
-	<br class="clear" />
 	</div>
 </div>
 <div class="theme-overlay"></div>