diff --git a/wp-includes/class-wp-customize-control.php b/wp-includes/class-wp-customize-control.php
index 10ce6ce3dd..32d76658df 100644
--- a/wp-includes/class-wp-customize-control.php
+++ b/wp-includes/class-wp-customize-control.php
@@ -145,7 +145,7 @@ class WP_Customize_Control {
 	 * @since 3.4.0
 	 */
 	protected function render() {
-		$id    = 'customize-control-' . $this->id;
+		$id    = 'customize-control-' . str_replace( '[', '-', str_replace( ']', '', $this->id ) );
 		$class = 'customize-control customize-control-' . $this->type;
 
 		$style = '';
diff --git a/wp-includes/js/customize-controls.dev.js b/wp-includes/js/customize-controls.dev.js
index 996c727337..d16b91514a 100644
--- a/wp-includes/js/customize-controls.dev.js
+++ b/wp-includes/js/customize-controls.dev.js
@@ -48,7 +48,8 @@
 			$.extend( this, options || {} );
 
 			this.id = id;
-			this.container = $( '#customize-control-' + id );
+			this.selector = '#customize-control-' + id.replace( ']', '' ).replace( '[', '-' );
+			this.container = $( this.selector );
 
 			settings = $.map( this.params.settings, function( value ) {
 				return value;