Make sure theme change stays on the correct panel.