case-2948 - Second menu level fix