Fix settings navigation (issue #1656)