Fix for active items in control panel