Move expandControlSection() call to control.onExpanded()