diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 2956e05122..f9f11b37c4 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -252,7 +252,7 @@ body {
 	font: normal 20px/1 dashicons;
 	content: "\f341";
 	position: relative;
-	top: 13px;
+	top: 7px;
 	left: 13px;
 }
 
@@ -260,7 +260,7 @@ body {
 	content: "\f344";
 }
 
-.current-panel .control-panel-back {
+.in-sub-panel .control-panel-back {
 	left: 0;
 }
 
diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php
index de43197695..3cfa0c787b 100644
--- a/src/wp-admin/customize.php
+++ b/src/wp-admin/customize.php
@@ -121,6 +121,7 @@ do_action( 'customize_controls_print_scripts' );
 			<a class="customize-controls-close" href="<?php echo esc_url( $return ); ?>">
 				<span class="screen-reader-text"><?php _e( 'Cancel' ); ?></span>
 			</a>
+			<span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
 		</div>
 
 		<?php
diff --git a/src/wp-admin/js/accordion.js b/src/wp-admin/js/accordion.js
index e395d8d864..6cb1c1ca85 100644
--- a/src/wp-admin/js/accordion.js
+++ b/src/wp-admin/js/accordion.js
@@ -47,14 +47,14 @@
 		});
 
 		// Go back to the top-level Customizer accordion.
-		$( '.accordion-container' ).on( 'click keydown', '.control-panel-back', function( e ) {
+		$( '#customize-header-actions' ).on( 'click keydown', '.control-panel-back', function( e ) {
 			if ( e.type === 'keydown' && 13 !== e.which ) { // "return" key
 				return;
 			}
 
 			e.preventDefault(); // Keep this AFTER the key filter above
 
-			panelSwitch( $( this ) );
+			panelSwitch( $( '.current-panel' ) );
 		});
 	});
 
@@ -108,7 +108,7 @@
 			container = section.closest( '.accordion-container' ),
 			siblings = container.find( '.open' ),
 			topPanel = overlay.find( '#customize-theme-controls > ul > .accordion-section > .accordion-section-title' ).add( '#customize-info > .accordion-section-title' ),
-			backBtn = section.find( '.control-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-panel.php b/src/wp-includes/class-wp-customize-panel.php
index 379129e4cc..8f85049dcb 100644
--- a/src/wp-includes/class-wp-customize-panel.php
+++ b/src/wp-includes/class-wp-customize-panel.php
@@ -174,7 +174,6 @@ class WP_Customize_Panel {
 				<?php echo esc_html( $this->title ); ?>
 				<span class="screen-reader-text"><?php _e( 'Press return or enter to open this panel' ); ?></span>
 			</h3>
-			<span class="control-panel-back" tabindex="-1"><span class="screen-reader-text"><?php _e( 'Back' ); ?></span></span>
 			<ul class="accordion-sub-container control-panel-content">
 				<li class="accordion-section control-section<?php if ( empty( $this->description ) ) echo ' cannot-expand'; ?>">
 					<div class="accordion-section-title" tabindex="0">