diff --git a/wp-content/themes/twentyfifteen/js/functions.js b/wp-content/themes/twentyfifteen/js/functions.js
index 1124de0d4d..ba102a0cb4 100644
--- a/wp-content/themes/twentyfifteen/js/functions.js
+++ b/wp-content/themes/twentyfifteen/js/functions.js
@@ -99,9 +99,9 @@
 		var windowPos = $window.scrollTop(),
 			windowHeight = $window.height(),
 			sidebarHeight = $sidebar.height(),
-			bodyHeight = $body.height();
+			pageHeight = $( '#page' ).height();
 
-		if( 955 < $window.width() && bodyHeight > sidebarHeight && ( windowPos + windowHeight ) >= sidebarHeight ) {
+		if ( 955 < $window.width() && pageHeight > sidebarHeight && ( windowPos + windowHeight ) >= sidebarHeight ) {
 			$sidebar.css({
 				position: 'fixed',
 				bottom: sidebarHeight > windowHeight ? 0 : 'auto'
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 57573b0e25..2337ba9831 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-beta2-53246';
+$wp_version = '6.0-beta2-53247';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.