Base: Improved fix for FireFox and control group buttons