Bugfix/controlbar events [Finishes #78737770]