diff --git a/modules/infinite-scroll/infinity.js b/modules/infinite-scroll/infinity.js
index 110012462c90a..3977496ffc562 100644
--- a/modules/infinite-scroll/infinity.js
+++ b/modules/infinite-scroll/infinity.js
@@ -339,6 +339,8 @@ Scroller.prototype.refresh = function() {
 					if ( response.lastbatch ) {
 						if ( self.click_handle ) {
 							$( '#infinite-handle' ).remove();
+							// Update body classes
+							self.body.addClass( 'infinity-end' ).removeClass( 'infinity-success' );
 						} else {
 							self.body.trigger( 'infinite-scroll-posts-end' );
 						}
diff --git a/modules/infinite-scroll/infinity.php b/modules/infinite-scroll/infinity.php
index f99ca93f108e3..9e4739e95d4cd 100644
--- a/modules/infinite-scroll/infinity.php
+++ b/modules/infinite-scroll/infinity.php
@@ -1466,7 +1466,7 @@ function_exists( 'wp_get_theme' ) ? wp_get_theme()->Name : get_current_theme()
 		<div id="infinite-footer">
 			<div class="container">
 				<div class="blog-info">
-					<a id="infinity-blog-title" href="<?php echo home_url( '/' ); ?>" target="_blank" rel="home">
+					<a id="infinity-blog-title" href="<?php echo home_url( '/' ); ?>" rel="home">
 						<?php bloginfo( 'name' ); ?>
 					</a>
 				</div>