Control Panel: grid resorting fix