MenuSheet fix from share rooms branch