Correctly handle menu