Fixed behaviour in settings page