Fix and cleanup menu to key event