Fix issue where layout menu was unintentionally disabled