diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 27def3f147..15927a63b9 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -193,6 +193,12 @@ body {
 	border-left: 4px solid #fff;
 }
 
+#customize-controls #customize-theme-controls .customize-themes-panel .accordion-section-title {
+	color: #555;
+	background-color: #fff;
+	border-left: 4px solid #fff;
+}
+
 #customize-theme-controls .accordion-section-title:after {
 	content: "\f345";
 	color: #a0a5aa;
@@ -1189,6 +1195,7 @@ p.customize-section-description {
 	margin: 0 0 15px;
 }
 
+#customize-controls .customize-themes-panel .accordion-section-title:hover,
 #customize-controls .customize-themes-panel .accordion-section-title {
 	margin: 15px -8px;
 }
diff --git a/src/wp-admin/js/customize-controls.js b/src/wp-admin/js/customize-controls.js
index 8ca8318705..25145a1ae6 100644
--- a/src/wp-admin/js/customize-controls.js
+++ b/src/wp-admin/js/customize-controls.js
@@ -1267,6 +1267,8 @@
 
 				overlay.addClass( 'in-themes-panel' );
 				section.addClass( 'current-panel' );
+				_.delay( panel.renderScreenshots, 10 ); // Wait for the controls
+				panel.$customizeSidebar.on( 'scroll.customize-themes-section', _.throttle( panel.renderScreenshots, 300 ) );
 
 			} else if ( ! expanded && section.hasClass( 'current-panel' ) ) {
 				panel._animateChangeExpanded( function() {
@@ -1283,6 +1285,7 @@
 
 				overlay.removeClass( 'in-themes-panel' );
 				section.removeClass( 'current-panel' );
+				panel.$customizeSidebar.off( 'scroll.customize-themes-section' );
 			}
 		},