Add workaround for top panel button highlighting