This is implemented by getting rid of the checkbox hack and using Javascript instead.
👉 Review
Closes #440 (closed)