diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index ea6c9eae75..030e02edcc 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -945,21 +945,16 @@ p.customize-section-description {
 	left: 100%;
 }
 
-.themes-panel-back:before {
-	top: 13px;
+.in-themes-panel .control-panel-back:before {
+	content: "\f345";
 	left: 14px;
 }
 
-.in-themes-panel .themes-panel-back {
+.in-themes-panel .control-panel-back {
 	left: 0;
 }
 
-.in-sub-panel .themes-panel-back {
-	display: none;
-}
-
-.control-panel-back.themes-panel-back:before {
-	content: "\f345";
+.in-themes-panel .control-panel-back:before {
 }
 
 /* Details View */
diff --git a/src/wp-admin/js/customize-controls.js b/src/wp-admin/js/customize-controls.js
index 1cd2ded387..86cb94954c 100644
--- a/src/wp-admin/js/customize-controls.js
+++ b/src/wp-admin/js/customize-controls.js
@@ -598,14 +598,17 @@
 				}
 			});
 
-			section.container.find( '.themes-panel-back' ).on( 'click keydown', function( event ) {
+
+			$( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( event ) {
 				if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
 					return;
 				}
 
 				event.preventDefault(); // Keep this AFTER the key filter above
 
-				section.collapse();
+				if ( section.expanded() ) {
+					section.collapse();
+				}
 			});
 
 			// Theme navigation in details view.
@@ -691,7 +694,7 @@
 				container = section.closest( '.wp-full-overlay-sidebar-content' ),
 				siblings = container.find( '.open' ),
 				topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ).add( '#customize-info > .accordion-section-title' ),
-				backBtn = overlay.find( '.themes-panel-back' ),
+				backBtn = overlay.find( '.control-panel-back' ),
 				panelTitle = section.find( '.accordion-section-title' ).first(),
 				content = section.find( '.control-panel-content' );
 
diff --git a/src/wp-includes/class-wp-customize-section.php b/src/wp-includes/class-wp-customize-section.php
index c2afac6d1e..779f9c6621 100644
--- a/src/wp-includes/class-wp-customize-section.php
+++ b/src/wp-includes/class-wp-customize-section.php
@@ -345,7 +345,6 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 				<?php echo esc_html( $this->title ); ?>
 				<span class="screen-reader-text"><?php _e( 'Press return or enter to expand' ); ?></span>
 			</h3>
-			<span class="control-panel-back themes-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
 			<div class="customize-themes-panel control-panel-content themes-php">
 				<h2><?php esc_html_e( 'Themes' ); ?>
 					<span class="title-count theme-count"><?php echo count( $this->controls ) - 1; ?></span>