Invalidate on menu change too