Fix mapping for new tab