diff --git a/wp-admin/js/customize-controls.js b/wp-admin/js/customize-controls.js
index 4e3dd8b645..9a1bde061c 100644
--- a/wp-admin/js/customize-controls.js
+++ b/wp-admin/js/customize-controls.js
@@ -104,6 +104,9 @@
 				if (!toggleFreeze)
 					control.container.toggleClass('open');
 
+				if ( control.container.hasClass('open') )
+					control.container.parent().parent().find('li.library-selected').focus();
+
 				// Don't want to fire focus and click at same time
 				toggleFreeze = true;
 				setTimeout(function () {