Fixed menu enabling issue