diff --git a/wp-admin/customize.php b/wp-admin/customize.php
index 7eedff8105..2f8725eddd 100644
--- a/wp-admin/customize.php
+++ b/wp-admin/customize.php
@@ -60,14 +60,20 @@ do_action( 'customize_controls_print_scripts' );
 			</a>
 		</div>
 
+		<?php
+			$screenshot = $wp_customize->theme()->get_screenshot();
+			$cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
+		?>
+
 		<div class="wp-full-overlay-sidebar-content">
-			<div id="customize-info" class="customize-section">
+			<div id="customize-info" class="customize-section<?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
 				<div class="customize-section-title">
 					<span class="preview-notice"><?php _e('You are previewing'); ?></span>
 					<strong class="theme-name"><?php echo $wp_customize->theme()->display('Name'); ?></strong>
 				</div>
+				<?php if ( ! $cannot_expand ) : ?>
 				<div class="customize-section-content">
-					<?php if ( $screenshot = $wp_customize->theme()->get_screenshot() ) : ?>
+					<?php if ( $screenshot ) : ?>
 						<img class="theme-screenshot" src="<?php echo esc_url( $screenshot ); ?>" />
 					<?php endif; ?>
 
@@ -75,6 +81,7 @@ do_action( 'customize_controls_print_scripts' );
 						<div class="theme-description"><?php echo $wp_customize->theme()->display('Description'); ?></div>
 					<?php endif; ?>
 				</div>
+				<?php endif; ?>
 			</div>
 
 			<div id="customize-theme-controls"><ul>
diff --git a/wp-includes/css/customize-controls.dev.css b/wp-includes/css/customize-controls.dev.css
index fd51845dd4..8a8d22a9a3 100644
--- a/wp-includes/css/customize-controls.dev.css
+++ b/wp-includes/css/customize-controls.dev.css
@@ -28,6 +28,10 @@ body {
 	user-select: none;
 }
 
+.cannot-expand .customize-section-title {
+	cursor: auto;
+}
+
 .customize-section-content {
 	display: none;
 	padding: 10px 20px 15px;
@@ -84,6 +88,10 @@ body {
 	z-index: 1;
 }
 
+.cannot-expand .customize-section-title:after {
+	display: none;
+}
+
 .customize-section.open .customize-section-title:after {
 	margin-top: -1px;
 	border-width: 0 6px 6px;
diff --git a/wp-includes/js/customize-controls.dev.js b/wp-includes/js/customize-controls.dev.js
index 59283e79ed..cea634c25c 100644
--- a/wp-includes/js/customize-controls.dev.js
+++ b/wp-includes/js/customize-controls.dev.js
@@ -594,11 +594,15 @@
 		});
 
 		// Temporary accordion code.
-		$('.customize-section-title').click( function() {
+		$('.customize-section-title').click( function( event ) {
 			var clicked = $( this ).parents( '.customize-section' );
+
+			if ( clicked.hasClass('cannot-expand') )
+				return;
+
 			$( '.customize-section' ).not( clicked ).removeClass( 'open' );
 			clicked.toggleClass( 'open' );
-			return false;
+			event.preventDefault();
 		});
 
 		// Button bindings.