Fix: disabling controls works properly

Would lose custom events previously (ie, button clicks, etc)