[ui] Better behavior for theme selector