Expanded fix for menu redraw bug