DNP cherrypick: Fixed esc menu getting into invalid state due to missing node