Fix theme change causing UI lockup