Fix to enabled settings screen in 2.6