Accounts for how now (correctly) need to have an enabled surface to have activity and therefore a panel.